You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2006/12/19 11:12:50 UTC
svn commit: r488610 - in
/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core: ./
.classpath build.xml ivy.xml lib/ src/main/ src/main/java/
src/main/java/org/ src/main/java/org/apache/ src/org/
Author: pamarcelot
Date: Tue Dec 19 02:12:49 2006
New Revision: 488610
URL: http://svn.apache.org/viewvc?view=rev&rev=488610
Log:
Updating ldapstudio-browser-core. Reorganization of sources. Added Ant and Ivy files.
Added:
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/build.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/ivy.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/src/main/
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/src/main/java/
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/src/main/java/org/
- copied from r488345, directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/src/org/
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/
- copied from r488609, directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/src/org/apache/
Removed:
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/lib/
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/src/org/
Modified:
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/ (props changed)
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/.classpath
Propchange: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Dec 19 02:12:49 2006
@@ -0,0 +1,2 @@
+
+target
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/.classpath
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/.classpath?view=diff&rev=488610&r1=488609&r2=488610
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/.classpath (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/.classpath Tue Dec 19 02:12:49 2006
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="output" path="target/classes"/>
<classpathentry kind="lib" path="lib/antlr-2.7.5.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
<classpathentry kind="lib" path="lib/poi-2.5.1-final-20040804.jar"/>
- <classpathentry kind="output" path="classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
</classpath>
Added: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/build.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/build.xml?view=auto&rev=488610
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/build.xml (added)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/build.xml Tue Dec 19 02:12:49 2006
@@ -0,0 +1,138 @@
+<!--
+ 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="ldapstudio-browser-core" default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+ <property name="project.name" value="org.apache.directory.ldapstudio.browser-core" />
+ <property name="project.version" value="0.5.5" />
+
+ <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,checkclasses,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>
+ <javac
+ source="1.5"
+ debug="yes"
+ srcdir="${project.src}"
+ excludes=""
+ destdir="${project.build}"
+ classpathref="classpath"
+ listfiles="yes" />
+
+ <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>
+
+ <target name="checkclasses">
+ <uptodate property="classes-up2date" targetfile="${project.build}/compile.timestamp">
+ <srcfiles dir="${project.src}" />
+ </uptodate>
+ </target>
+
+ <!-- ================================== -->
+ <!-- JAVADOC -->
+ <!-- ================================== -->
+ <target name="javadoc" description="Generate Javadoc files">
+ <mkdir dir="${basedir}/doc" />
+ <javadoc destdir="${basedir}/doc">
+ <fileset dir="src/main/java" defaultexcludes="yes">
+ <include name="org/apache/directory/ldapstudio/**"/>
+ </fileset>
+ </javadoc>
+ </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="about.html"/>
+ <exclude name="antlr.xml"/>
+ <exclude name="build.properties"/>
+ <exclude name="build.xml"/>
+ <exclude name="ivy.xml"/>
+ <exclude name="plugin.properties"/>
+ <exclude name="plugin.xml"/>
+ <exclude name="about_files/**"/>
+ <exclude name="META-INF/**"/>
+ <exclude name="src/**" />
+ </fileset>
+ </delete>
+ </target>
+</project>
Added: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/ivy.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/ivy.xml?view=auto&rev=488610
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/ivy.xml (added)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-browser-core/ivy.xml Tue Dec 19 02:12:49 2006
@@ -0,0 +1,26 @@
+<!--
+ 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.
+-->
+<ivy-module version="1.0">
+ <info organisation="org.apache.directory.ldapstudio" module="ldapstudio-browser-core"/>
+ <dependencies>
+ <dependency org="antlr" name="antlr" rev="2.7.5"/>
+ <dependency org="commons-codec" name="commons-codec" rev="1.3"/>
+ <dependency org="org.apache.poi" name="poi" rev="2.5.1-final-20040804"/>
+ </dependencies>
+</ivy-module>
\ No newline at end of file