Return-Path: 
 <commits-return-14176-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 43327 invoked from network); 12 Jun 2007 14:07:19 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 12 Jun 2007 14:07:19 -0000
Received: (qmail 15961 invoked by uid 500); 12 Jun 2007 14:07:23 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 15914 invoked by uid 500); 12 Jun 2007 14:07:21 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 15902 invoked by uid 99); 12 Jun 2007 14:07:21 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2007 07:07:21 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2007 07:07:17 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0A49C1A981A; Tue, 12 Jun 2007 07:06:57 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r546489 - in /directory/studio/trunk/studio-build: ./
 .project
 build.xml plugin.properties
Date: Tue, 12 Jun 2007 14:06:56 -0000
To: commits@directory.apache.org
From: pamarcelot@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070612140657.0A49C1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: pamarcelot
Date: Tue Jun 12 07:06:55 2007
New Revision: 546489

URL: http://svn.apache.org/viewvc?view=rev&rev=546489
Log:
Added the new studio-build project that will help simplify the build process.

Added:
    directory/studio/trunk/studio-build/
    directory/studio/trunk/studio-build/.project
    directory/studio/trunk/studio-build/build.xml
    directory/studio/trunk/studio-build/plugin.properties

Added: directory/studio/trunk/studio-build/.project
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-build/.project?view=auto&rev=546489
==============================================================================
--- directory/studio/trunk/studio-build/.project (added)
+++ directory/studio/trunk/studio-build/.project Tue Jun 12 07:06:55 2007
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>studio-build</name>
+	<comment/>
+	<projects/>
+	<buildSpec/>
+	<natures/>
+</projectDescription>

Added: directory/studio/trunk/studio-build/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-build/build.xml?view=auto&rev=546489
==============================================================================
--- directory/studio/trunk/studio-build/build.xml (added)
+++ directory/studio/trunk/studio-build/build.xml Tue Jun 12 07:06:55 2007
@@ -0,0 +1,141 @@
+<!--
+  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="studio.build" default ="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+	
+	<!-- Setting standard project properties -->
+	<property name="src" value="${basedir}/src" />
+	<property name="src.main.java" value="${src}/main/java" />
+	<property name="src.main.resources" value="${src}/main/resources" />
+	<property name="src.test.java" value="${src}/test/java" />
+	<property name="src.test.resources" value="${src}/test/resources" />
+	<property name="target" value="${basedir}/target" />
+	<property name="target.classes" value="${target}/classes" />
+	<property name="target.test-classes" value="${target}/test-classes" />
+	<property name="target.build" value="${target}/build" />
+	<property name="target.doc" value="${target}/doc" />
+	<property name="lib.dir" value="${basedir}/lib" />
+	
+	<!-- Loading specific project properties -->
+	<property  file="${basedir}/plugin.properties" />
+	
+
+	<!-- INSTALL-IVY TASK -->
+	<target name="install-ivy">
+		<!-- Installing Ivy -->
+		<path id="ivy.lib.path">
+			<fileset dir="../tools" includes="ivy.jar"/>
+		</path> 
+		<taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/> 
+		<!-- Configuring Ivy -->
+		<property name="repository.dir" location="../dependencies/externals/"/>
+		<ivy:configure file="../tools/ivyconf.xml"/>
+	</target>
+
+	<!-- RETRIEVE-DEPENDENCIES TASK -->
+	<target name="retrieve-dependencies" depends="install-ivy" description="Retreive dependencies with ivy">
+		<ivy:retrieve/>
+	</target>
+
+	
+	<!-- BUILD-CLASSPATH TASK -->
+	<target name="build-classpath" description="Computes the classpath" >
+		<path id="classpath">
+			<!-- Project dependencies -->
+			<fileset dir="${lib.dir}" />
+		</path>
+	</target>
+	
+
+	<!-- COMPILE TASK -->
+	<target name="compile" depends="retrieve-dependencies,build-classpath" description="Compiles the sources">
+		<!-- Compiling main sources -->
+		<mkdir dir="${target.classes}"/>
+		<javac source="1.5" srcdir="${src.main.java}" destdir="${target.classes}" classpathref="classpath" />
+		<copy todir="${target.classes}" failonerror="false">
+			<fileset dir="${src.main.resources}">
+				<include name="**" />
+			</fileset>
+		</copy>
+		<!-- Compiling test sources -->
+		<mkdir dir="${target.test-classes}"/>
+		<javac source="1.5" srcdir="${src.test.java}" destdir="${target.test-classes}" classpathref="classpath" />
+		<copy todir="${target.test-classes}" failonerror="false">
+			<fileset dir="${src.test.resources}">
+				<include name="**" />
+			</fileset>
+		</copy>
+	</target>
+	
+
+	<!-- JAR TASK -->
+	<target name="jar" depends="compile" description="Creates a Jar from the compiled sources">
+		<copy todir="${target.build}" failonerror="false">
+			<fileset dir="${target.classes}">
+				<include name="**" />
+			</fileset>
+			<fileset dir="${basedir}">
+				<include name="META-INF/**" />
+			</fileset>
+		</copy>
+		<jar destfile="${target}/${project.name}-${project.version}.jar" manifest="${target.build}/META-INF/MANIFEST.MF">
+			<fileset dir="${target.build}" />
+		</jar>
+	</target>
+	
+	
+	<!-- PLUGIN TASK -->
+	<target name="plugin" depends="compile" description="Creates a Jar from the compiled sources">
+		<copy todir="${target.build}" failonerror="false">
+			<fileset dir="${target.classes}">
+				<include name="**" />
+			</fileset>
+			<fileset dir="${basedir}">
+				<include name="about.html" />
+				<include name="lib/**" />
+				<include name="META-INF/**" />
+				<include name="plugin.properties" />
+				<include name="plugin.xml" />
+				<include name="resources/**" />
+			</fileset>
+		</copy>
+		<jar destfile="${target}/${project.id}_${project.version}.jar" manifest="${target.build}/META-INF/MANIFEST.MF">
+			<fileset dir="${target.build}" />
+		</jar>
+	</target>
+
+
+	<!-- JAVADOC TASK -->
+	<target name="javadoc" depends="build-classpath" description="Generate Javadoc files">
+		<mkdir dir="${target.doc}" />
+		<javadoc destdir="${target.doc}" classpathref="classpath">
+			<fileset dir="${src.main.java}" defaultexcludes="yes">
+				<include name="**/*.java"/>
+			</fileset>
+		</javadoc>
+	</target>
+
+	
+	<!-- CLEAN TASK -->
+	<target name="clean" description="Deletes any generated file (javadoc, classes, jars, distribution)">
+		<echo>Cleaning ${project.name} (${project.id}) version ${project.version}</echo>
+		<delete dir="${lib.dir}"/>
+		<delete dir="${target}"/>
+	</target>
+	
+</project>
\ No newline at end of file

Added: directory/studio/trunk/studio-build/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-build/plugin.properties?view=auto&rev=546489
==============================================================================
--- directory/studio/trunk/studio-build/plugin.properties (added)
+++ directory/studio/trunk/studio-build/plugin.properties Tue Jun 12 07:06:55 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 Build
+project.version=1.0.0.SNAPSHOT
+project.id=org.apache.directory.studio.build