directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r569923 - in /directory/studio/trunk: ./ studio-aciitemeditor/ studio-connection-core/ studio-connection-ui/ studio-ldapbrowser-common/ studio-ldapbrowser-core/ studio-ldapbrowser-ui/ studio-ldifeditor/ studio-valueeditors/
Date Sun, 26 Aug 2007 23:31:26 GMT
Author: seelmann
Date: Sun Aug 26 16:31:26 2007
New Revision: 569923

URL: http://svn.apache.org/viewvc?rev=569923&view=rev
Log:
Fixed broken build

Added:
    directory/studio/trunk/studio-connection-core/plugin.properties
    directory/studio/trunk/studio-connection-ui/plugin.properties
Modified:
    directory/studio/trunk/build.xml
    directory/studio/trunk/studio-aciitemeditor/build.xml
    directory/studio/trunk/studio-connection-ui/build.xml
    directory/studio/trunk/studio-ldapbrowser-common/build.xml
    directory/studio/trunk/studio-ldapbrowser-core/build.xml
    directory/studio/trunk/studio-ldapbrowser-ui/build.xml
    directory/studio/trunk/studio-ldifeditor/build.xml
    directory/studio/trunk/studio-valueeditors/build.xml

Modified: directory/studio/trunk/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/build.xml?rev=569923&r1=569922&r2=569923&view=diff
==============================================================================
--- directory/studio/trunk/build.xml (original)
+++ directory/studio/trunk/build.xml Sun Aug 26 16:31:26 2007
@@ -127,6 +127,24 @@
             </fileset>
         </copy>
 
+        <!-- Creation of the Connection Core Plugin -->
+        <ant dir="studio-connection-core" inheritAll="no" />
+        <!-- Copy of the Connection Core Plugin in the "plugins" folder of the RCP app
-->
+        <copy todir="${application.plugins}">
+            <fileset dir="studio-connection-core/target">
+                <include name="*.jar" />
+            </fileset>
+        </copy>
+
+        <!-- Creation of the Connection UI Plugin -->
+        <ant dir="studio-connection-ui" inheritAll="no" />
+        <!-- Copy of the Connection UI Plugin in the "plugins" folder of the RCP app -->
+        <copy todir="${application.plugins}">
+            <fileset dir="studio-connection-ui/target">
+                <include name="*.jar" />
+            </fileset>
+        </copy>
+
         <!-- Creation of the Browser Core Plugin -->
         <ant dir="studio-ldapbrowser-core" inheritAll="no" />
         <!-- Copy of the Browser Core Plugin in the "plugins" folder of the RCP app -->
@@ -361,6 +379,8 @@
     <target name="javadoc" description="Generate Javadoc files">
         <ant dir="studio-aciitemeditor" inheritAll="no" target="javadoc" />
         <ant dir="studio-apacheds-configuration" inheritAll="no" target="javadoc" />
+        <ant dir="studio-connection-core" inheritAll="no" target="javadoc" />
+        <ant dir="studio-connection-ui" inheritAll="no" target="javadoc" />
         <ant dir="studio-dsml-parser" inheritAll="no" target="javadoc" />
         <ant dir="studio-ldapbrowser-common" inheritAll="no" target="javadoc" />
         <ant dir="studio-ldapbrowser-core" inheritAll="no" target="javadoc" />
@@ -377,6 +397,8 @@
         <ant dir="studio-aciitemeditor" inheritAll="no" target="retrieve-dependencies"
/>
         <ant dir="studio-apacheds-configuration" inheritAll="no" target="retrieve-dependencies"
/>
         <ant dir="studio-apacheds-configuration-help" inheritAll="no" target="retrieve-dependencies"
/>
+        <ant dir="studio-connection-core" inheritAll="no" target="retrieve-dependencies"
/>
+        <ant dir="studio-connection-ui" inheritAll="no" target="retrieve-dependencies"
/>
         <ant dir="studio-dsml-parser" inheritAll="no" target="retrieve-dependencies" />
         <ant dir="studio-jars" inheritAll="no" target="retrieve-dependencies" />
         <ant dir="studio-ldapbrowser-common" inheritAll="no" target="retrieve-dependencies"
/>
@@ -402,6 +424,8 @@
         <ant dir="studio-apacheds-configuration" inheritAll="no" target="clean" />
         <ant dir="studio-apacheds-configuration-help" inheritAll="no" target="clean" />
         <ant dir="studio-apacheds-configuration-feature" inheritAll="no" target="clean"
/>
+        <ant dir="studio-connection-core" inheritAll="no" target="clean" />
+        <ant dir="studio-connection-ui" inheritAll="no" target="clean" />
         <ant dir="studio-dsml-parser" inheritAll="no" target="clean" />
         <ant dir="studio-jars" inheritAll="no" target="clean" />
         <ant dir="studio-ldapbrowser-common" inheritAll="no" target="clean" />

Modified: directory/studio/trunk/studio-aciitemeditor/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-aciitemeditor/build.xml?rev=569923&r1=569922&r2=569923&view=diff
==============================================================================
--- directory/studio/trunk/studio-aciitemeditor/build.xml (original)
+++ directory/studio/trunk/studio-aciitemeditor/build.xml Sun Aug 26 16:31:26 2007
@@ -28,6 +28,8 @@
 	
 	<!-- COMPILE-DEPENDENCIES TASK -->
 	<target name="compile-dependencies" description="Compiles the dependencies of the project"
>
+		<ant dir="../studio-connection-core" target="compile" inheritall="false" />
+		<ant dir="../studio-connection-ui" target="compile" inheritall="false" />
 		<ant dir="../studio-ldapbrowser-core" target="compile" inheritall="false" />
 		<ant dir="../studio-ldapbrowser-common" target="compile" inheritall="false" />
 		<ant dir="../studio-valueeditors" target="compile" inheritall="false" />
@@ -46,6 +48,8 @@
 			</fileset>
 			<!-- Plugin dependencies -->
 			<fileset dir="../studio-jars/lib/" />
+			<pathelement location="../studio-connection-core/target/classes"/>
+			<pathelement location="../studio-connection-ui/target/classes"/>
 			<pathelement location="../studio-ldapbrowser-core/target/classes"/>
 			<pathelement location="../studio-ldapbrowser-common/target/classes"/>
 			<pathelement location="../studio-valueeditors/target/classes"/>

Added: directory/studio/trunk/studio-connection-core/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-connection-core/plugin.properties?rev=569923&view=auto
==============================================================================
--- directory/studio/trunk/studio-connection-core/plugin.properties (added)
+++ directory/studio/trunk/studio-connection-core/plugin.properties Sun Aug 26 16:31:26 2007
@@ -0,0 +1,19 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+project.name=Apache Directory Studio Connection Core Plugin
+project.version=1.0.0
+project.id=org.apache.directory.studio.connection.core

Modified: directory/studio/trunk/studio-connection-ui/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-connection-ui/build.xml?rev=569923&r1=569922&r2=569923&view=diff
==============================================================================
--- directory/studio/trunk/studio-connection-ui/build.xml (original)
+++ directory/studio/trunk/studio-connection-ui/build.xml Sun Aug 26 16:31:26 2007
@@ -31,7 +31,7 @@
 	</target>
 	
 	<!-- BUILD-CLASSPATH TASK -->
-	<target name="build-classpath" depends="retrieve-studio-jar-dependencies" description="Computes
the classpath" >
+	<target name="build-classpath" depends="retrieve-studio-jar-dependencies,compile-dependencies"
description="Computes the classpath" >
 		<echo>Building classpath for ${project.name} (${project.id}) version ${project.version}</echo>
 		<path id="classpath">
 			<!-- Project dependencies -->

Added: directory/studio/trunk/studio-connection-ui/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-connection-ui/plugin.properties?rev=569923&view=auto
==============================================================================
--- directory/studio/trunk/studio-connection-ui/plugin.properties (added)
+++ directory/studio/trunk/studio-connection-ui/plugin.properties Sun Aug 26 16:31:26 2007
@@ -0,0 +1,19 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+project.name=Apache Directory Studio Connection UI Plugin
+project.version=1.0.0
+project.id=org.apache.directory.studio.connection.ui

Modified: directory/studio/trunk/studio-ldapbrowser-common/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/build.xml?rev=569923&r1=569922&r2=569923&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/build.xml (original)
+++ directory/studio/trunk/studio-ldapbrowser-common/build.xml Sun Aug 26 16:31:26 2007
@@ -28,6 +28,8 @@
 	
 	<!-- COMPILE-DEPENDENCIES TASK -->
 	<target name="compile-dependencies" description="Compiles the dependencies of the project"
>
+		<ant dir="../studio-connection-core" target="compile" inheritall="false" />
+		<ant dir="../studio-connection-ui" target="compile" inheritall="false" />
 		<ant dir="../studio-ldapbrowser-core" target="compile" inheritall="false" />
 	</target>
 	
@@ -44,8 +46,10 @@
 			</fileset>
 			<!-- Plugin dependencies -->
 			<fileset dir="../studio-jars/lib/" />
+			<pathelement location="../studio-connection-core/target/classes"/>
+			<pathelement location="../studio-connection-ui/target/classes"/>
 			<pathelement location="../studio-ldapbrowser-core/target/classes"/>
 		</path>
 	</target>
 	
-</project>
\ No newline at end of file
+</project>

Modified: directory/studio/trunk/studio-ldapbrowser-core/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/build.xml?rev=569923&r1=569922&r2=569923&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/build.xml (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/build.xml Sun Aug 26 16:31:26 2007
@@ -26,8 +26,14 @@
 	</target>
 	
 	
+        <!-- COMPILE-DEPENDENCIES TASK -->
+        <target name="compile-dependencies" description="Compiles the dependencies of
the project" >
+                <ant dir="../studio-connection-core" target="compile" inheritall="false"
/>
+        </target>
+	
+	
 	<!-- BUILD-CLASSPATH TASK -->
-	<target name="build-classpath" depends="retrieve-studio-jar-dependencies" description="Computes
the classpath" >
+	<target name="build-classpath" depends="retrieve-studio-jar-dependencies,compile-dependencies"
description="Computes the classpath" >
 		<echo>Building classpath for ${project.name} (${project.id}) version ${project.version}</echo>
 		<path id="classpath">
 			<!-- Project dependencies -->
@@ -38,6 +44,7 @@
 			</fileset>
 			<!-- Plugin dependencies -->
 			<fileset dir="../studio-jars/lib/" />
+			<pathelement location="../studio-connection-core/target/classes"/>
 		</path>
 	</target>
 	

Modified: directory/studio/trunk/studio-ldapbrowser-ui/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/build.xml?rev=569923&r1=569922&r2=569923&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/build.xml (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/build.xml Sun Aug 26 16:31:26 2007
@@ -28,6 +28,8 @@
 	
 	<!-- COMPILE-DEPENDENCIES TASK -->
 	<target name="compile-dependencies" description="Compiles the dependencies of the project"
>
+		<ant dir="../studio-connection-core" target="compile" inheritall="false" />
+		<ant dir="../studio-connection-ui" target="compile" inheritall="false" />
 		<ant dir="../studio-ldapbrowser-core" target="compile" inheritall="false" />
 		<ant dir="../studio-ldapbrowser-common" target="compile" inheritall="false" />
 		<ant dir="../studio-ldifeditor" target="compile" inheritall="false" />
@@ -46,6 +48,8 @@
 			</fileset>
 			<!-- Plugin dependencies -->
 			<fileset dir="../studio-jars/lib/" />
+			<pathelement location="../studio-connection-core/target/classes"/>
+			<pathelement location="../studio-connection-ui/target/classes"/>
 			<pathelement location="../studio-ldapbrowser-core/target/classes"/>
 			<pathelement location="../studio-ldapbrowser-common/target/classes"/>
 			<pathelement location="../studio-ldifeditor/target/classes"/>

Modified: directory/studio/trunk/studio-ldifeditor/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldifeditor/build.xml?rev=569923&r1=569922&r2=569923&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldifeditor/build.xml (original)
+++ directory/studio/trunk/studio-ldifeditor/build.xml Sun Aug 26 16:31:26 2007
@@ -28,6 +28,8 @@
 	
 	<!-- COMPILE-DEPENDENCIES TASK -->
 	<target name="compile-dependencies" description="Compiles the dependencies of the project"
>
+		<ant dir="../studio-connection-core" target="compile" inheritall="false" />
+		<ant dir="../studio-connection-ui" target="compile" inheritall="false" />
 		<ant dir="../studio-ldapbrowser-core" target="compile" inheritall="false" />
 		<ant dir="../studio-ldapbrowser-common" target="compile" inheritall="false" />
 	</target>
@@ -45,6 +47,8 @@
 			</fileset>
 			<!-- Plugin dependencies -->
 			<fileset dir="../studio-jars/lib/" />
+			<pathelement location="../studio-connection-core/target/classes"/>
+			<pathelement location="../studio-connection-ui/target/classes"/>
 			<pathelement location="../studio-ldapbrowser-core/target/classes"/>
 			<pathelement location="../studio-ldapbrowser-common/target/classes"/>
 		</path>

Modified: directory/studio/trunk/studio-valueeditors/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-valueeditors/build.xml?rev=569923&r1=569922&r2=569923&view=diff
==============================================================================
--- directory/studio/trunk/studio-valueeditors/build.xml (original)
+++ directory/studio/trunk/studio-valueeditors/build.xml Sun Aug 26 16:31:26 2007
@@ -28,6 +28,8 @@
 	
 	<!-- COMPILE-DEPENDENCIES TASK -->
 	<target name="compile-dependencies" description="Compiles the dependencies of the project"
>
+		<ant dir="../studio-connection-core" target="compile" inheritall="false" />
+		<ant dir="../studio-connection-ui" target="compile" inheritall="false" />
 		<ant dir="../studio-ldapbrowser-core" target="compile" inheritall="false" />
 		<ant dir="../studio-ldapbrowser-common" target="compile" inheritall="false" />
 	</target>
@@ -45,6 +47,8 @@
 			</fileset>
 			<!-- Plugin dependencies -->
 			<fileset dir="../studio-jars/lib/" />
+			<pathelement location="../studio-connection-core/target/classes"/>
+			<pathelement location="../studio-connection-ui/target/classes"/>
 			<pathelement location="../studio-ldapbrowser-core/target/classes"/>
 			<pathelement location="../studio-ldapbrowser-common/target/classes"/>
 		</path>



Mime
View raw message