directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r547695 - in /directory/studio/trunk: build.xml studio-build/build.xml
Date Fri, 15 Jun 2007 14:27:13 GMT
Author: pamarcelot
Date: Fri Jun 15 07:27:12 2007
New Revision: 547695

URL: http://svn.apache.org/viewvc?view=rev&rev=547695
Log:
Fixed a bug that was making the features not correctly installed in Apache Directory Studio.
The features was packaged into jar while they should have been packaged into simple folders.

Modified:
    directory/studio/trunk/build.xml
    directory/studio/trunk/studio-build/build.xml

Modified: directory/studio/trunk/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/build.xml?view=diff&rev=547695&r1=547694&r2=547695
==============================================================================
--- directory/studio/trunk/build.xml (original)
+++ directory/studio/trunk/build.xml Fri Jun 15 07:27:12 2007
@@ -223,7 +223,7 @@
         <!-- Copy of the Apache Directory Studio RCP Feature in the "features" folder
-->
         <copy todir="${application.features}">
             <fileset dir="studio-rcp-feature/target">
-                <include name="*.jar" />
+                <exclude name="*.jar" />
             </fileset>
         </copy>
 		
@@ -232,7 +232,7 @@
         <!-- Copy of the Schemas Editor Feature in the "features" folder -->
         <copy todir="${application.features}">
             <fileset dir="studio-schemaeditor-feature/target">
-                <include name="*.jar" />
+                <exclude name="*.jar" />
             </fileset>
         </copy>
 		
@@ -241,7 +241,7 @@
 	    <!-- Copy of the LDAP Browser Feature in the "features" folder -->
 	    <copy todir="${application.features}">
             <fileset dir="studio-ldapbrowser-feature/target">
-                <include name="*.jar" />
+                <exclude name="*.jar" />
             </fileset>
         </copy>
 
@@ -250,7 +250,7 @@
         <!-- Copy of the Apache DS Configuration Feature in the "features" folder -->
         <copy todir="${application.features}">
             <fileset dir="studio-apacheds-configuration-feature/target">
-                <include name="*.jar" />
+                <exclude name="*.jar" />
             </fileset>
         </copy>
 

Modified: directory/studio/trunk/studio-build/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-build/build.xml?view=diff&rev=547695&r1=547694&r2=547695
==============================================================================
--- directory/studio/trunk/studio-build/build.xml (original)
+++ directory/studio/trunk/studio-build/build.xml Fri Jun 15 07:27:12 2007
@@ -131,7 +131,7 @@
 	
 	<!-- FEATURE TASK -->
 	<target name="feature" description="Creates a Feature Jar">
-		<copy todir="${target.build}" failonerror="false">
+		<copy todir="${target}/${project.id}_${project.version}" failonerror="false">
 			<fileset dir="${basedir}">
 				<include name="feature.xml" />
 				<include name="feature.properties" />
@@ -139,8 +139,8 @@
 				<include name="studio.png**" />
 			</fileset>
 		</copy>
-		<jar destfile="${target}/${project.id}_${project.version}.jar" manifest="${target.build}/META-INF/MANIFEST.MF">
-			<fileset dir="${target.build}" />
+		<jar destfile="${target}/${project.id}_${project.version}.jar" manifest="${target}/${project.id}_${project.version}/META-INF/MANIFEST.MF">
+			<fileset dir="${target}/${project.id}_${project.version}" />
 		</jar>
 	</target>
 



Mime
View raw message