LPS-43061 Rename dir to just registry, since final jar will be com.li…

…feray.registry.jar (or something like it, just like how Spring and others prepends their jar name with a package)
brianchandotcom · Feb 17, 2014 · 62af772 · 62af772
1 parent 250aecb
commit 62af772
Show file tree

Hide file tree

Showing 25 changed files with 18 additions and 18 deletions.
diff --git a/.classpath b/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="definitions"/>
 	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="osgi/bootstrap/src"/>
-	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="osgi/modules/portal-registry/portal-registry-api/src/main/java"/>
+	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="osgi/modules/registry/registry-api/src/main/java"/>
 	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="portal-impl/src"/>
 	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="portal-impl/test/integration"/>
 	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="portal-impl/test/unit"/>

diff --git a/build-common-java.xml b/build-common-java.xml
@@ -50,8 +50,8 @@
 				</if>
 
 				<gradle-execute
-					gradleModuleDir="/portal-registry"
-					gradleTask=":portal-registry-api:compileJava"
+					gradleModuleDir="/registry"
+					gradleTask=":registry-api:compileJava"
 				/>
 
 				<mkdir dir="classes" />

diff --git a/build-common.xml b/build-common.xml
@@ -53,15 +53,15 @@
 
 	<path id="project.classpath">
 		<pathelement path="${classpath}" />
-		<pathelement path="${project.dir}/osgi/modules/portal-registry/portal-registry-api/build/classes/main" />
+		<pathelement path="${project.dir}/osgi/modules/registry/registry-api/build/classes/main" />
 		<path refid="lib.classpath" />
 	</path>
 
 	<path id="test.classpath">
 		<pathelement path="test-classes/${test.type}" />
 		<pathelement path="${classpath}" />
 		<pathelement path="${imported.classpath}" />
-		<pathelement path="${project.dir}/osgi/modules/portal-registry/portal-registry-api/build/classes/main" />
+		<pathelement path="${project.dir}/osgi/modules/registry/registry-api/build/classes/main" />
 		<fileset dir="${project.dir}/lib/development" includes="*.jar" excludes="jalopy.jar,jetty*.jar,tomcat*.jar" />
 		<fileset dir="${project.dir}/lib/global" includes="*.jar" />
 		<fileset dir="${project.dir}/lib/portal" includes="*.jar" excludes="ant.jar" />
@@ -70,7 +70,7 @@
 
 	<path id="web.classpath">
 		<pathelement location="${project.dir}/portal-service/classes" />
-		<pathelement path="${project.dir}/osgi/modules/portal-registry/portal-registry-api/build/classes/main" />
+		<pathelement path="${project.dir}/osgi/modules/registry/registry-api/build/classes/main" />
 		<fileset dir="${project.dir}/lib/development" includes="jsp-api.jar,mail.jar,servlet-api.jar" />
 		<fileset dir="${project.dir}/lib/global" includes="*.jar" />
 		<fileset dir="${project.dir}/lib/portal" includes="bnd.jar" />

diff --git a/nbproject/project.xml b/nbproject/project.xml
@@ -24,9 +24,9 @@
 					<encoding>UTF-8</encoding>
 				</source-folder>
 				<source-folder>
-					<label>osgi\modules\portal-registry\portal-registry-api\src\main\java</label>
+					<label>osgi\modules\registry\registry-api\src\main\java</label>
 					<type>java</type>
-					<location>osgi/modules/portal-registry/portal-registry-api/src/main/java</location>
+					<location>osgi/modules/registry/registry-api/src/main/java</location>
 					<encoding>UTF-8</encoding>
 				</source-folder>
 				<source-folder>
@@ -154,8 +154,8 @@
 						<location>osgi/bootstrap/src</location>
 					</source-folder>
 					<source-folder style="packages">
-						<label>osgi\modules\portal-registry\portal-registry-api\src\main\java</label>
-						<location>osgi/modules/portal-registry/portal-registry-api/src/main/java</location>
+						<label>osgi\modules\registry\registry-api\src\main\java</label>
+						<location>osgi/modules/registry/registry-api/src/main/java</location>
 					</source-folder>
 					<source-folder style="packages">
 						<label>portal-impl\src</label>

diff --git a/osgi/modules/.gitignore b/osgi/modules/.gitignore
@@ -1,3 +1,3 @@
 .gradle
 
-/portal-registry/portal-registry-api/build
+/registry/registry-api/build
diff --git a/osgi/modules/portal-registry/portal-registry-impl/build.gradle b/osgi/modules/portal-registry/portal-registry-impl/build.gradle
diff --git a/osgi/modules/portal-registry/settings.gradle b/osgi/modules/portal-registry/settings.gradle
diff --git a/osgi/modules/portal-registry/build.gradle → osgi/modules/registry/build.gradle b/osgi/modules/portal-registry/build.gradle → osgi/modules/registry/build.gradle
diff --git a/...rtal-registry/portal-registry-api/bnd.bnd → osgi/modules/registry/registry-api/bnd.bnd b/...rtal-registry/portal-registry-api/bnd.bnd → osgi/modules/registry/registry-api/bnd.bnd
diff --git a/...registry/portal-registry-api/build.gradle → ...odules/registry/registry-api/build.gradle b/...registry/portal-registry-api/build.gradle → ...odules/registry/registry-api/build.gradle
diff --git a/...ain/java/com/liferay/registry/Filter.java → ...ain/java/com/liferay/registry/Filter.java b/...ain/java/com/liferay/registry/Filter.java → ...ain/java/com/liferay/registry/Filter.java
diff --git a/...n/java/com/liferay/registry/Registry.java → ...n/java/com/liferay/registry/Registry.java b/...n/java/com/liferay/registry/Registry.java → ...n/java/com/liferay/registry/Registry.java
diff --git a/...va/com/liferay/registry/RegistryUtil.java → ...va/com/liferay/registry/RegistryUtil.java b/...va/com/liferay/registry/RegistryUtil.java → ...va/com/liferay/registry/RegistryUtil.java
diff --git a/...om/liferay/registry/ServiceReference.java → ...om/liferay/registry/ServiceReference.java b/...om/liferay/registry/ServiceReference.java → ...om/liferay/registry/ServiceReference.java
diff --git a/...liferay/registry/ServiceRegistration.java → ...liferay/registry/ServiceRegistration.java b/...liferay/registry/ServiceRegistration.java → ...liferay/registry/ServiceRegistration.java
diff --git a/.../com/liferay/registry/ServiceTracker.java → .../com/liferay/registry/ServiceTracker.java b/.../com/liferay/registry/ServiceTracker.java → .../com/liferay/registry/ServiceTracker.java
diff --git a/...ay/registry/ServiceTrackerCollection.java → ...ay/registry/ServiceTrackerCollection.java b/...ay/registry/ServiceTrackerCollection.java → ...ay/registry/ServiceTrackerCollection.java
diff --git a/...ay/registry/ServiceTrackerCustomizer.java → ...ay/registry/ServiceTrackerCustomizer.java b/...ay/registry/ServiceTrackerCustomizer.java → ...ay/registry/ServiceTrackerCustomizer.java
diff --git a/...ain/java/com/liferay/registry/packageinfo → ...ain/java/com/liferay/registry/packageinfo b/...ain/java/com/liferay/registry/packageinfo → ...ain/java/com/liferay/registry/packageinfo
diff --git a/...tal-registry/portal-registry-impl/bnd.bnd → osgi/modules/registry/registry-impl/bnd.bnd b/...tal-registry/portal-registry-impl/bnd.bnd → osgi/modules/registry/registry-impl/bnd.bnd
diff --git a/osgi/modules/registry/registry-impl/build.gradle b/osgi/modules/registry/registry-impl/build.gradle
@@ -0,0 +1 @@
+evaluationDependsOn(':registry-api')
diff --git a/osgi/modules/registry/settings.gradle b/osgi/modules/registry/settings.gradle
@@ -0,0 +1 @@
+include 'registry-api'
diff --git a/osgi/modules/settings.gradle b/osgi/modules/settings.gradle
@@ -1,3 +1,3 @@
-include 'portal-registry'
+include 'registry'
 
 rootProject.name = 'osgi-modules'
diff --git a/portal-impl/build.xml b/portal-impl/build.xml
@@ -1437,8 +1437,8 @@ public class Creole10Parser]]></replacevalue>
 			</and>
 			<then>
 				<gradle-execute
-					gradleModuleDir="/portal-registry"
-					gradleTask=":portal-registry-api:compileJava"
+					gradleModuleDir="/registry"
+					gradleTask=":registry-api:compileJava"
 				/>
 
 				<javac

diff --git a/portal-service/build.xml b/portal-service/build.xml
@@ -10,8 +10,8 @@
 
 	<target name="compile">
 		<gradle-execute
-			gradleModuleDir="/portal-registry"
-			gradleTask=":portal-registry-api:compileJava"
+			gradleModuleDir="/registry"
+			gradleTask=":registry-api:compileJava"
 		/>
 
 		<mkdir dir="classes" />