From 4f1c28e8c2bb65a3672fec9580efca5276e8ba62 Mon Sep 17 00:00:00 2001 From: Winston Li Date: Sun, 2 Nov 2014 18:47:54 +0000 Subject: [PATCH] Refactored package names. --- services/git-bridge/.idea/workspace.xml | 252 ++++++++++++------ .../src/uk/ac/ic/{ => wlgitbridge}/Main.java | 4 +- .../application/WLGitBridgeApplication.java | 2 +- .../application/WLGitBridgeServer.java | 4 +- .../{ => wlgitbridge}/git/WLGitServlet.java | 2 +- .../git/WLGitServletConfig.java | 2 +- .../git/WLReceivePackFactory.java | 2 +- .../git/WLRepositoryResolver.java | 2 +- .../git/WLUploadPackFactory.java | 2 +- .../ic/{ => wlgitbridge}/test/MainTests.java | 2 +- .../WLGitBridgeApplicationTests.java | 2 +- .../application/WLGitBridgeServerTests.java | 2 +- .../test/git/WLGitServletConfigTests.java | 2 +- .../test/git/WLGitServletTests.java | 2 +- .../test/git/WLReceivePackFactoryTests.java | 2 +- .../test/git/WLRepositoryResolverTests.java | 2 +- .../test/git/WLUploadPackTests.java | 2 +- 17 files changed, 182 insertions(+), 106 deletions(-) rename services/git-bridge/src/uk/ac/ic/{ => wlgitbridge}/Main.java (64%) rename services/git-bridge/src/uk/ac/ic/{ => wlgitbridge}/application/WLGitBridgeApplication.java (91%) rename services/git-bridge/src/uk/ac/ic/{ => wlgitbridge}/application/WLGitBridgeServer.java (93%) rename services/git-bridge/src/uk/ac/ic/{ => wlgitbridge}/git/WLGitServlet.java (94%) rename services/git-bridge/src/uk/ac/ic/{ => wlgitbridge}/git/WLGitServletConfig.java (96%) rename services/git-bridge/src/uk/ac/ic/{ => wlgitbridge}/git/WLReceivePackFactory.java (95%) rename services/git-bridge/src/uk/ac/ic/{ => wlgitbridge}/git/WLRepositoryResolver.java (98%) rename services/git-bridge/src/uk/ac/ic/{ => wlgitbridge}/git/WLUploadPackFactory.java (95%) rename services/git-bridge/test/uk/ac/ic/{ => wlgitbridge}/test/MainTests.java (80%) rename services/git-bridge/test/uk/ac/ic/{ => wlgitbridge}/test/application/WLGitBridgeApplicationTests.java (77%) rename services/git-bridge/test/uk/ac/ic/{ => wlgitbridge}/test/application/WLGitBridgeServerTests.java (77%) rename services/git-bridge/test/uk/ac/ic/{ => wlgitbridge}/test/git/WLGitServletConfigTests.java (80%) rename services/git-bridge/test/uk/ac/ic/{ => wlgitbridge}/test/git/WLGitServletTests.java (80%) rename services/git-bridge/test/uk/ac/ic/{ => wlgitbridge}/test/git/WLReceivePackFactoryTests.java (80%) rename services/git-bridge/test/uk/ac/ic/{ => wlgitbridge}/test/git/WLRepositoryResolverTests.java (80%) rename services/git-bridge/test/uk/ac/ic/{ => wlgitbridge}/test/git/WLUploadPackTests.java (80%) diff --git a/services/git-bridge/.idea/workspace.xml b/services/git-bridge/.idea/workspace.xml index dc4f4b7390..e6857b2d64 100644 --- a/services/git-bridge/.idea/workspace.xml +++ b/services/git-bridge/.idea/workspace.xml @@ -2,16 +2,22 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -35,9 +41,9 @@ - + - + @@ -45,9 +51,9 @@ - + - + @@ -55,9 +61,9 @@ - + - + @@ -65,9 +71,9 @@ - + - + @@ -75,9 +81,9 @@ - + - + @@ -85,9 +91,9 @@ - + - + @@ -95,9 +101,9 @@ - + - + @@ -105,9 +111,9 @@ - + - + @@ -115,9 +121,9 @@ - + - + @@ -125,9 +131,9 @@ - + - + @@ -180,6 +186,7 @@ @@ -214,7 +221,6 @@ - @@ -310,7 +316,7 @@ + @@ -405,16 +412,17 @@ - - - + + + + - + + + - - - - - + + @@ -625,7 +633,6 @@ - @@ -636,17 +643,18 @@ - - - + + + + @@ -675,11 +683,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -687,7 +774,6 @@ - @@ -695,11 +781,10 @@ - - + @@ -711,7 +796,6 @@ - @@ -719,7 +803,6 @@ - @@ -727,7 +810,6 @@ - @@ -735,11 +817,10 @@ - - + @@ -751,7 +832,6 @@ - @@ -759,7 +839,6 @@ - @@ -767,7 +846,6 @@ - @@ -775,7 +853,6 @@ - @@ -783,7 +860,6 @@ - @@ -803,7 +879,7 @@ - + @@ -811,7 +887,7 @@ - + @@ -819,7 +895,7 @@ - + @@ -827,7 +903,7 @@ - + @@ -835,7 +911,7 @@ - + @@ -843,7 +919,7 @@ - + @@ -851,7 +927,7 @@ - + @@ -859,7 +935,7 @@ - + @@ -867,7 +943,7 @@ - + @@ -875,7 +951,7 @@ - + @@ -883,7 +959,7 @@ - + @@ -891,7 +967,7 @@ - + @@ -899,7 +975,7 @@ - + @@ -907,7 +983,7 @@ - + @@ -915,7 +991,7 @@ - + @@ -923,9 +999,9 @@ - + - + diff --git a/services/git-bridge/src/uk/ac/ic/Main.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/Main.java similarity index 64% rename from services/git-bridge/src/uk/ac/ic/Main.java rename to services/git-bridge/src/uk/ac/ic/wlgitbridge/Main.java index a0cc6d09b8..5dd5a7e941 100644 --- a/services/git-bridge/src/uk/ac/ic/Main.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/Main.java @@ -1,6 +1,6 @@ -package uk.ac.ic; +package uk.ac.ic.wlgitbridge; -import uk.ac.ic.application.WLGitBridgeApplication; +import uk.ac.ic.wlgitbridge.application.WLGitBridgeApplication; /** * Created by Winston on 01/11/14. diff --git a/services/git-bridge/src/uk/ac/ic/application/WLGitBridgeApplication.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplication.java similarity index 91% rename from services/git-bridge/src/uk/ac/ic/application/WLGitBridgeApplication.java rename to services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplication.java index 83ce7f1a35..84a8bfd8cb 100644 --- a/services/git-bridge/src/uk/ac/ic/application/WLGitBridgeApplication.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplication.java @@ -1,4 +1,4 @@ -package uk.ac.ic.application; +package uk.ac.ic.wlgitbridge.application; import javax.servlet.ServletException; diff --git a/services/git-bridge/src/uk/ac/ic/application/WLGitBridgeServer.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java similarity index 93% rename from services/git-bridge/src/uk/ac/ic/application/WLGitBridgeServer.java rename to services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java index f00f6e987e..5f533e504d 100644 --- a/services/git-bridge/src/uk/ac/ic/application/WLGitBridgeServer.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java @@ -1,9 +1,9 @@ -package uk.ac.ic.application; +package uk.ac.ic.wlgitbridge.application; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import uk.ac.ic.git.WLGitServlet; +import uk.ac.ic.wlgitbridge.git.WLGitServlet; import javax.servlet.ServletException; import java.net.BindException; diff --git a/services/git-bridge/src/uk/ac/ic/git/WLGitServlet.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLGitServlet.java similarity index 94% rename from services/git-bridge/src/uk/ac/ic/git/WLGitServlet.java rename to services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLGitServlet.java index 88a65fea07..18116871f7 100644 --- a/services/git-bridge/src/uk/ac/ic/git/WLGitServlet.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLGitServlet.java @@ -1,4 +1,4 @@ -package uk.ac.ic.git; +package uk.ac.ic.wlgitbridge.git; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jgit.http.server.GitServlet; diff --git a/services/git-bridge/src/uk/ac/ic/git/WLGitServletConfig.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLGitServletConfig.java similarity index 96% rename from services/git-bridge/src/uk/ac/ic/git/WLGitServletConfig.java rename to services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLGitServletConfig.java index e55750f802..95a596598a 100644 --- a/services/git-bridge/src/uk/ac/ic/git/WLGitServletConfig.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLGitServletConfig.java @@ -1,4 +1,4 @@ -package uk.ac.ic.git; +package uk.ac.ic.wlgitbridge.git; import org.eclipse.jetty.servlet.ServletContextHandler; diff --git a/services/git-bridge/src/uk/ac/ic/git/WLReceivePackFactory.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLReceivePackFactory.java similarity index 95% rename from services/git-bridge/src/uk/ac/ic/git/WLReceivePackFactory.java rename to services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLReceivePackFactory.java index 51af7b4f6a..d78a189aad 100644 --- a/services/git-bridge/src/uk/ac/ic/git/WLReceivePackFactory.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLReceivePackFactory.java @@ -1,4 +1,4 @@ -package uk.ac.ic.git; +package uk.ac.ic.wlgitbridge.git; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.transport.ReceivePack; diff --git a/services/git-bridge/src/uk/ac/ic/git/WLRepositoryResolver.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLRepositoryResolver.java similarity index 98% rename from services/git-bridge/src/uk/ac/ic/git/WLRepositoryResolver.java rename to services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLRepositoryResolver.java index d4ae308a04..22ebf7dcc3 100644 --- a/services/git-bridge/src/uk/ac/ic/git/WLRepositoryResolver.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLRepositoryResolver.java @@ -1,4 +1,4 @@ -package uk.ac.ic.git; +package uk.ac.ic.wlgitbridge.git; import org.eclipse.jgit.api.AddCommand; import org.eclipse.jgit.api.CommitCommand; diff --git a/services/git-bridge/src/uk/ac/ic/git/WLUploadPackFactory.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLUploadPackFactory.java similarity index 95% rename from services/git-bridge/src/uk/ac/ic/git/WLUploadPackFactory.java rename to services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLUploadPackFactory.java index a80d66978a..6493b06f71 100644 --- a/services/git-bridge/src/uk/ac/ic/git/WLUploadPackFactory.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/WLUploadPackFactory.java @@ -1,4 +1,4 @@ -package uk.ac.ic.git; +package uk.ac.ic.wlgitbridge.git; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.transport.UploadPack; diff --git a/services/git-bridge/test/uk/ac/ic/test/MainTests.java b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/MainTests.java similarity index 80% rename from services/git-bridge/test/uk/ac/ic/test/MainTests.java rename to services/git-bridge/test/uk/ac/ic/wlgitbridge/test/MainTests.java index 80790493aa..aa889c7287 100644 --- a/services/git-bridge/test/uk/ac/ic/test/MainTests.java +++ b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/MainTests.java @@ -1,4 +1,4 @@ -package uk.ac.ic.test; +package uk.ac.ic.wlgitbridge.test; import org.junit.Test; diff --git a/services/git-bridge/test/uk/ac/ic/test/application/WLGitBridgeApplicationTests.java b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java similarity index 77% rename from services/git-bridge/test/uk/ac/ic/test/application/WLGitBridgeApplicationTests.java rename to services/git-bridge/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java index e08d26cd28..f8d060cf42 100644 --- a/services/git-bridge/test/uk/ac/ic/test/application/WLGitBridgeApplicationTests.java +++ b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java @@ -1,4 +1,4 @@ -package uk.ac.ic.test.application; +package uk.ac.ic.wlgitbridge.test.application; import org.junit.Test; diff --git a/services/git-bridge/test/uk/ac/ic/test/application/WLGitBridgeServerTests.java b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeServerTests.java similarity index 77% rename from services/git-bridge/test/uk/ac/ic/test/application/WLGitBridgeServerTests.java rename to services/git-bridge/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeServerTests.java index 496965648d..7c39ac4852 100644 --- a/services/git-bridge/test/uk/ac/ic/test/application/WLGitBridgeServerTests.java +++ b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeServerTests.java @@ -1,4 +1,4 @@ -package uk.ac.ic.test.application; +package uk.ac.ic.wlgitbridge.test.application; import org.junit.Test; diff --git a/services/git-bridge/test/uk/ac/ic/test/git/WLGitServletConfigTests.java b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLGitServletConfigTests.java similarity index 80% rename from services/git-bridge/test/uk/ac/ic/test/git/WLGitServletConfigTests.java rename to services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLGitServletConfigTests.java index 93ef372565..d78f43ad3b 100644 --- a/services/git-bridge/test/uk/ac/ic/test/git/WLGitServletConfigTests.java +++ b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLGitServletConfigTests.java @@ -1,4 +1,4 @@ -package uk.ac.ic.test.git; +package uk.ac.ic.wlgitbridge.test.git; import org.junit.Test; diff --git a/services/git-bridge/test/uk/ac/ic/test/git/WLGitServletTests.java b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLGitServletTests.java similarity index 80% rename from services/git-bridge/test/uk/ac/ic/test/git/WLGitServletTests.java rename to services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLGitServletTests.java index 407e9ac52b..0a90b8ea1f 100644 --- a/services/git-bridge/test/uk/ac/ic/test/git/WLGitServletTests.java +++ b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLGitServletTests.java @@ -1,4 +1,4 @@ -package uk.ac.ic.test.git; +package uk.ac.ic.wlgitbridge.test.git; import org.junit.Test; diff --git a/services/git-bridge/test/uk/ac/ic/test/git/WLReceivePackFactoryTests.java b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLReceivePackFactoryTests.java similarity index 80% rename from services/git-bridge/test/uk/ac/ic/test/git/WLReceivePackFactoryTests.java rename to services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLReceivePackFactoryTests.java index 05d4cc4602..870ea5810d 100644 --- a/services/git-bridge/test/uk/ac/ic/test/git/WLReceivePackFactoryTests.java +++ b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLReceivePackFactoryTests.java @@ -1,4 +1,4 @@ -package uk.ac.ic.test.git; +package uk.ac.ic.wlgitbridge.test.git; import org.junit.Test; diff --git a/services/git-bridge/test/uk/ac/ic/test/git/WLRepositoryResolverTests.java b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLRepositoryResolverTests.java similarity index 80% rename from services/git-bridge/test/uk/ac/ic/test/git/WLRepositoryResolverTests.java rename to services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLRepositoryResolverTests.java index a15e0498df..183c82d12e 100644 --- a/services/git-bridge/test/uk/ac/ic/test/git/WLRepositoryResolverTests.java +++ b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLRepositoryResolverTests.java @@ -1,4 +1,4 @@ -package uk.ac.ic.test.git; +package uk.ac.ic.wlgitbridge.test.git; import org.junit.Test; diff --git a/services/git-bridge/test/uk/ac/ic/test/git/WLUploadPackTests.java b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLUploadPackTests.java similarity index 80% rename from services/git-bridge/test/uk/ac/ic/test/git/WLUploadPackTests.java rename to services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLUploadPackTests.java index c419565955..4a0d7c2943 100644 --- a/services/git-bridge/test/uk/ac/ic/test/git/WLUploadPackTests.java +++ b/services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLUploadPackTests.java @@ -1,4 +1,4 @@ -package uk.ac.ic.test.git; +package uk.ac.ic.wlgitbridge.test.git; import org.junit.Test;