LPS-284

git-svn-id: svn://svn.liferay.com/repos/public/portal/trunk@21953 05bdf26c-840f-0410-9ced-eb539d925f36
xieh · Oct 24, 2008 · 3f768e7 · 3f768e7
1 parent 31e6734
commit 3f768e7
Show file tree

Hide file tree

Showing 7 changed files with 1,521 additions and 1,521 deletions.
diff --git a/.classpath b/.classpath
@@ -74,12 +74,12 @@
 	<classpathentry kind="lib" path="lib/development/tomcat-coyote.jar"/>
 	<classpathentry kind="lib" path="lib/development/tomcat-util.jar"/>
 	<classpathentry kind="lib" path="lib/development/yuicompressor.jar"/>
-	<classpathentry kind="lib" path="lib/global/annotations.jar"/>
 	<classpathentry kind="lib" path="lib/global/container.jar"/>
 	<classpathentry kind="lib" path="lib/global/portlet.jar"/>
 	<classpathentry kind="lib" path="lib/global/portlet-container.jar"/>
 	<classpathentry kind="lib" path="lib/global/saw-api.jar"/>
 	<classpathentry kind="lib" path="lib/portal/amazon-a2s.jar"/>
+	<classpathentry kind="lib" path="lib/portal/annotations.jar"/>
 	<classpathentry kind="lib" path="lib/portal/ant.jar"/>
 	<classpathentry kind="lib" path="lib/portal/antlr.jar"/>
 	<classpathentry kind="lib" path="lib/portal/aopalliance.jar"/>

diff --git a/build-dist.xml b/build-dist.xml
@@ -691,7 +691,7 @@ app.server.tomcat.zip.name=liferay-portal-tomcat-6.0-$${downloads.version}.zip
 		<zip destfile="dist/liferay-portal-dependencies-${lp.version}.zip">
 			<zipfileset
 				dir="lib/global"
-				includes="annotations.jar,container.jar,portlet.jar,portlet-container.jar"
+				includes="container.jar,portlet.jar,portlet-container.jar"
 				prefix="liferay-portal-dependencies-${lp.version}"
 			/>
 			<zipfileset

diff --git a/lib/global/annotations.jar → lib/portal/annotations.jar b/lib/global/annotations.jar → lib/portal/annotations.jar