directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r546786 - in /directory/studio/trunk/studio-jars: .classpath build.properties build.xml plugin.properties src/ src/main/ src/main/java/ src/test/ src/test/java/
Date Wed, 13 Jun 2007 09:24:43 GMT
Author: pamarcelot
Date: Wed Jun 13 02:24:42 2007
New Revision: 546786

URL: http://svn.apache.org/viewvc?view=rev&rev=546786
Log:
Added source paths, plugin.properties and updated the build to use the new build system.

Added:
    directory/studio/trunk/studio-jars/plugin.properties
    directory/studio/trunk/studio-jars/src/
    directory/studio/trunk/studio-jars/src/main/
    directory/studio/trunk/studio-jars/src/main/java/
    directory/studio/trunk/studio-jars/src/test/
    directory/studio/trunk/studio-jars/src/test/java/
Modified:
    directory/studio/trunk/studio-jars/.classpath
    directory/studio/trunk/studio-jars/build.properties
    directory/studio/trunk/studio-jars/build.xml

Modified: directory/studio/trunk/studio-jars/.classpath
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-jars/.classpath?view=diff&rev=546786&r1=546785&r2=546786
==============================================================================
--- directory/studio/trunk/studio-jars/.classpath (original)
+++ directory/studio/trunk/studio-jars/.classpath Wed Jun 13 02:24:42 2007
@@ -10,5 +10,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.6.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 </classpath>

Modified: directory/studio/trunk/studio-jars/build.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-jars/build.properties?view=diff&rev=546786&r1=546785&r2=546786
==============================================================================
--- directory/studio/trunk/studio-jars/build.properties (original)
+++ directory/studio/trunk/studio-jars/build.properties Wed Jun 13 02:24:42 2007
@@ -6,4 +6,7 @@
                lib/nlog4j-1.2.25.jar,\
                lib/xpp3-1.1.3_8.jar,\
                lib/shared-asn1-0.9.7-SNAPSHOT.jar,\
-               lib/shared-ldap-0.9.7-SNAPSHOT.jar
+               lib/shared-ldap-0.9.7-SNAPSHOT.jar,\
+               .
+source.. = src/main/java/,\
+           src/test/java/

Modified: directory/studio/trunk/studio-jars/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-jars/build.xml?view=diff&rev=546786&r1=546785&r2=546786
==============================================================================
--- directory/studio/trunk/studio-jars/build.xml (original)
+++ directory/studio/trunk/studio-jars/build.xml Wed Jun 13 02:24:42 2007
@@ -16,93 +16,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-	<property name="project.name" value="org.apache.directory.studio.jars" />
-	<property name="project.version" value="0.8.0" />
-
-	<property name="project.output" value="${basedir}/target" />
-	<property name="project.build" value="${project.output}/build" />
-	<property name="project.src" value="${basedir}/src/main/java" />
-
-	<property name="lib.dir" value="lib" />
-
-	<property name="repository.dir" location="../dependencies/externals/"/>
-
-	<!-- Configuring Ivy (Needs to be AFTER the $repository.dir declaration) -->
-	<ivy:configure file="../tools/ivyconf.xml"/>
-
-	<!-- ================================== -->
-	<!--               RESOLVE              -->
-	<!-- ================================== -->
-	<target name="resolve" description="--> retreive dependencies with ivy">
-		<ivy:retrieve/>
-	</target>
-
-	<!-- ================================== -->
-	<!--             CLASSPATH              -->
-	<!-- ================================== -->
-	<target name="build-classpath" description="Computes a classpath according to current
OS" >
-		<path id="classpath">
-			<fileset dir="../dependencies/eclipse/3.2">
-				<include name="**/*.jar"/>
-			</fileset>
-			<fileset dir="${lib.dir}" />
-		</path>
-	</target>
-	
-	<!-- ================================== -->
-	<!--             COMPILE                -->
-	<!-- ================================== -->
-	<target name="compile" depends="resolve,build-classpath" unless="classes-up2date" description="Compiles
the plugin">
-		<mkdir dir="${project.build}" />
-		<copy todir="${project.build}">
-			<fileset dir="${basedir}">
-				<include name="plugin.xml" />
-			</fileset>
-		</copy>
-		<mkdir dir="${project.build}/${lib.dir}" />
-		<copy todir="${project.build}/${lib.dir}">
-			<fileset dir="${basedir}/${lib.dir}">
-				<include name="*.jar" />
-			</fileset>
-		</copy>
-		<mkdir dir="${project.build}/META-INF" />
-		<copy todir="${project.build}/META-INF">
-			<fileset dir="${basedir}/META-INF">
-				<include name="**" />
-			</fileset>
-		</copy>
-		
-		<tstamp>
-			<format pattern="yyyy-MMM-dd, HH:mm 'GMT'Z" property="timestamp" locale="en" />
-		</tstamp>
-		<echo message="${project.name}-${project.version} compiled ${timestamp} by ${user.name}"
file="${project.build}/compile.timestamp" />
-	</target>
-	
-	<!-- ================================== -->
-	<!--              JAR                   -->
-	<!-- ================================== -->
-	<target name="jar" description="Creates jar file" depends="compile">
-		<jar destfile="${project.output}/${project.name}_${project.version}.jar" manifest="${project.build}/META-INF/MANIFEST.MF">
-			<fileset dir="${project.build}" excludes="compile.timestamp" />
-		</jar>
-	</target>
-
-	<!-- ================================== -->
-	<!--               CLEAN                -->
-	<!-- ================================== -->
-	<target name="clean" description="Deletes any generated file (javadoc, classes, jars,
distribution)">
-		<delete includeemptydirs="true">
-			<fileset dir="${basedir}">
-				<exclude name=".classpath"/>
-				<exclude name=".project"/>
-				<exclude name="build.properties"/>
-				<exclude name="build.xml"/>
-				<exclude name="ivy.xml"/>
-				<exclude name="plugin.properties"/>
-				<exclude name="plugin.xml"/>
-				<exclude name="META-INF/**"/>
-			</fileset>
-		</delete>
-	</target>
+<project default="plugin">
+	<import file="../studio-build/build.xml"/>
 </project>

Added: directory/studio/trunk/studio-jars/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-jars/plugin.properties?view=auto&rev=546786
==============================================================================
--- directory/studio/trunk/studio-jars/plugin.properties (added)
+++ directory/studio/trunk/studio-jars/plugin.properties Wed Jun 13 02:24:42 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 Jars Plugin
+project.version=0.8.0
+project.id=org.apache.directory.studio.jars



Mime
View raw message