directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r546539 - in /directory/studio/trunk/studio-apacheds-configuration: ./ META-INF/ icons/ resources/ resources/icons/ src/main/java/org/apache/directory/studio/apacheds/configuration/
Date Tue, 12 Jun 2007 15:44:58 GMT
Author: pamarcelot
Date: Tue Jun 12 08:44:57 2007
New Revision: 546539

URL: http://svn.apache.org/viewvc?view=rev&rev=546539
Log:
Updated the Apache DS Configuration Plugin with the new build system.

Added:
    directory/studio/trunk/studio-apacheds-configuration/plugin.properties
    directory/studio/trunk/studio-apacheds-configuration/resources/
    directory/studio/trunk/studio-apacheds-configuration/resources/icons/
      - copied from r546153, directory/studio/trunk/studio-apacheds-configuration/icons/
Removed:
    directory/studio/trunk/studio-apacheds-configuration/icons/
Modified:
    directory/studio/trunk/studio-apacheds-configuration/META-INF/MANIFEST.MF
    directory/studio/trunk/studio-apacheds-configuration/build.properties
    directory/studio/trunk/studio-apacheds-configuration/build.xml
    directory/studio/trunk/studio-apacheds-configuration/plugin.xml
    directory/studio/trunk/studio-apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/PluginConstants.java

Modified: directory/studio/trunk/studio-apacheds-configuration/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-configuration/META-INF/MANIFEST.MF?view=diff&rev=546539&r1=546538&r2=546539
==============================================================================
--- directory/studio/trunk/studio-apacheds-configuration/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/studio-apacheds-configuration/META-INF/MANIFEST.MF Tue Jun 12 08:44:57
2007
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Apache Directory Studio Apache DS Configuration Plug-in
-Bundle-SymbolicName: org.apache.directory.studio.apacheds.configuration;singleton:=true
-Bundle-Version: 0.8.0
+Bundle-Name: %project.name
+Bundle-SymbolicName: %project.id;singleton:=true
+Bundle-Version: %project.version
 Bundle-Activator: org.apache.directory.studio.apacheds.configuration.Activator
 Bundle-Vendor: Apache Software Foundation
 Bundle-Localization: plugin

Modified: directory/studio/trunk/studio-apacheds-configuration/build.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-configuration/build.properties?view=diff&rev=546539&r1=546538&r2=546539
==============================================================================
--- directory/studio/trunk/studio-apacheds-configuration/build.properties (original)
+++ directory/studio/trunk/studio-apacheds-configuration/build.properties Tue Jun 12 08:44:57
2007
@@ -1,8 +1,8 @@
-bin.includes = META-INF/,\
-               plugin.xml,\
-               src/main/java/,\
-               .,\
-               icons/
 source.. = src/main/java/,\
 		   src/main/resources/,\
            src/test/java/
+bin.includes = .,\
+               META-INF/,\
+               plugin.xml,\
+               src/main/java/,\
+               resources/
\ No newline at end of file

Modified: directory/studio/trunk/studio-apacheds-configuration/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-configuration/build.xml?view=diff&rev=546539&r1=546538&r2=546539
==============================================================================
--- directory/studio/trunk/studio-apacheds-configuration/build.xml (original)
+++ directory/studio/trunk/studio-apacheds-configuration/build.xml Tue Jun 12 08:44:57 2007
@@ -16,136 +16,21 @@
   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.apacheds.configuration"
/>
-	<property name="project.version" value="0.8.0" />
-
-	<property name="output" value="${basedir}/target" />
-	<property name="build" value="${output}/build" />
-	<property name="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="retrieve dependencies with ivy">
-		<mkdir dir="${basedir}/${lib.dir}" />
-		<ivy:retrieve/>
-        <ant dir="../studio-jars" inheritAll="no" target="resolve" />
-	</target>
-
-	<!-- ================================== -->
-	<!--             CLASSPATH              -->
-	<!-- ================================== -->
-	<target name="build-classpath" description="Computes a classpath" >
+<project default="plugin">
+	<import file="../studio-build/build.xml"/>
+	
+	<!-- BUILD-CLASSPATH TASK -->
+	<target name="build-classpath" description="Computes the classpath" >
 		<path id="classpath">
+			<!-- Project dependencies -->
+			<fileset dir="${lib.dir}" />
+			<!-- Eclipse dependencies -->
 			<fileset dir="../dependencies/eclipse/3.2">
 				<include name="**/*.jar"/>
 			</fileset>
-			<fileset dir="${lib.dir}" />
+			<!-- Plugin dependencies -->
 			<fileset dir="../studio-jars/lib/" />
 		</path>
 	</target>
-
-	<!-- ================================== -->
-	<!--             COMPILE                -->
-	<!-- ================================== -->
-	<target name="compile" depends="resolve,checkclasses,build-classpath" unless="classes-up2date"
description="Compiles the plugin">
-		<mkdir dir="${build}" />
-		<copy todir="${build}">
-			<fileset dir="${basedir}">
-				<include name="plugin.xml" />
-				<include name="plugin.properties" />
-			</fileset>
-		</copy>
-		<mkdir dir="${build}/${lib.dir}" />
-		<copy todir="${build}/${lib.dir}">
-			<fileset dir="${basedir}/${lib.dir}">
-				<include name="*.jar" />
-			</fileset>
-		</copy>
-		<copy todir="${build}">
-			<fileset dir="${basedir}/src/main/resources">
-				<include name="**" />
-			</fileset>
-		</copy>
-		<mkdir dir="${build}/META-INF" />
-		<copy todir="${build}/META-INF">
-			<fileset dir="${basedir}/META-INF">
-				<include name="**" />
-			</fileset>
-		</copy>
-		<mkdir dir="${build}/icons" />
-		<copy todir="${build}/icons">
-			<fileset dir="${basedir}/icons">
-				<include name="**" />
-			</fileset>
-		</copy>
-		<javac
-			source="1.5"
-			debug="yes"
-			srcdir="${src}"
-			excludes=""
-			destdir="${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="${build}/compile.timestamp" />
-	</target>
-
-	<target name="checkclasses">
-		<uptodate property="classes-up2date" targetfile="${build}/compile.timestamp">
-			<srcfiles dir="${src}" />
-		</uptodate>
-	</target>
-
-
-	<!-- ================================== -->
-	<!--              JAR                   -->
-	<!-- ================================== -->
-	<target name="jar" description="Creates a jar file" depends="compile">
-		<jar destfile="${output}/${project.name}_${project.version}.jar" manifest="${build}/META-INF/MANIFEST.MF">
-			<fileset dir="${build}" excludes="compile.timestamp" />
-		</jar>
-	</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/studio/**"/>
-			</fileset>
-		</javadoc>
-	</target>
 	
-	<!-- ================================== -->
-	<!--               CLEAN                -->
-	<!-- ================================== -->
-	<target name="clean" description="Deletes any generated file (javadoc, classes, jars,
distribution)">
-		<delete includeemptydirs="true">
-			<fileset dir="${basedir}">
-				<exclude name=".project" />
-				<exclude name=".classpath" />
-				<exclude name="build.properties" />
-				<exclude name="build.xml" />
-				<exclude name="ivy.xml" />
-				<exclude name="META-INF/**" />
-				<exclude name="plugin.xml" />
-				<exclude name="src/**" />
-				<exclude name="icons/**" />
-			</fileset>
-		</delete>
-	</target>
 </project>

Added: directory/studio/trunk/studio-apacheds-configuration/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-configuration/plugin.properties?view=auto&rev=546539
==============================================================================
--- directory/studio/trunk/studio-apacheds-configuration/plugin.properties (added)
+++ directory/studio/trunk/studio-apacheds-configuration/plugin.properties Tue Jun 12 08:44:57
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 Apache DS Configuration Plug-in
+project.version=0.8.0
+project.id=org.apache.directory.studio.apacheds.configuration

Modified: directory/studio/trunk/studio-apacheds-configuration/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-configuration/plugin.xml?view=diff&rev=546539&r1=546538&r2=546539
==============================================================================
--- directory/studio/trunk/studio-apacheds-configuration/plugin.xml (original)
+++ directory/studio/trunk/studio-apacheds-configuration/plugin.xml Tue Jun 12 08:44:57 2007
@@ -47,7 +47,7 @@
       <editor
             class="org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditor"
             default="true"
-            icon="icons/editor.gif"
+            icon="resources/icons/editor.gif"
             id="org.apache.directory.studio.apacheds.configuration.editor"
             name="Server Configuration Editor">
       </editor>

Modified: directory/studio/trunk/studio-apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/PluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/PluginConstants.java?view=diff&rev=546539&r1=546538&r2=546539
==============================================================================
--- directory/studio/trunk/studio-apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/PluginConstants.java
(original)
+++ directory/studio/trunk/studio-apacheds-configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/PluginConstants.java
Tue Jun 12 08:44:57 2007
@@ -29,10 +29,10 @@
 public interface PluginConstants
 {
     // Images
-    public static final String IMG_VERTICAL_ORIENTATION = "icons/vertical_orientation.gif";
-    public static final String IMG_HORIZONTAL_ORIENTATION = "icons/horizontal_orientation.gif";
-    public static final String IMG_PARTITION = "icons/partition.gif";
-    public static final String IMG_PARTITION_SYSTEM = "icons/partition_system.gif";
-    public static final String IMG_INTERCEPTOR = "icons/interceptor.gif";
-    public static final String IMG_EXTENDED_OPERATION = "icons/extended_operation.gif";
+    public static final String IMG_VERTICAL_ORIENTATION = "resources/icons/vertical_orientation.gif";
+    public static final String IMG_HORIZONTAL_ORIENTATION = "resources/icons/horizontal_orientation.gif";
+    public static final String IMG_PARTITION = "resources/icons/partition.gif";
+    public static final String IMG_PARTITION_SYSTEM = "resources/icons/partition_system.gif";
+    public static final String IMG_INTERCEPTOR = "resources/icons/interceptor.gif";
+    public static final String IMG_EXTENDED_OPERATION = "resources/icons/extended_operation.gif";
 }



Mime
View raw message