directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erodrig...@apache.org
Subject svn commit: r397361 - in /directory/trunks/apacheds/osgi/main: apacheds.sh log4j.properties pom.xml src/main/java/ src/main/manifest/ src/main/resources/log4j.properties
Date Thu, 27 Apr 2006 02:08:50 GMT
Author: erodriguez
Date: Wed Apr 26 19:08:48 2006
New Revision: 397361

URL: http://svn.apache.org/viewcvs?rev=397361&view=rev
Log:
Updated the ApacheDS OSGi Main:
o  log4j.properties moved to resources and copied to conf.
o  Main class removed in favor of reusable Felix Main.

Added:
    directory/trunks/apacheds/osgi/main/src/main/resources/log4j.properties
      - copied, changed from r396997, directory/trunks/apacheds/osgi/main/log4j.properties
Removed:
    directory/trunks/apacheds/osgi/main/log4j.properties
    directory/trunks/apacheds/osgi/main/src/main/java/
    directory/trunks/apacheds/osgi/main/src/main/manifest/
Modified:
    directory/trunks/apacheds/osgi/main/apacheds.sh
    directory/trunks/apacheds/osgi/main/pom.xml

Modified: directory/trunks/apacheds/osgi/main/apacheds.sh
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/main/apacheds.sh?rev=397361&r1=397360&r2=397361&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/main/apacheds.sh (original)
+++ directory/trunks/apacheds/osgi/main/apacheds.sh Wed Apr 26 19:08:48 2006
@@ -6,4 +6,4 @@
   mvn clean install
 fi
 
-java -Dlog4j.configuration=file://$(pwd)/log4j.properties -jar bin/felix.jar
+java -Dlog4j.configuration=file://$(pwd)/conf/log4j.properties -jar bin/felix.jar

Modified: directory/trunks/apacheds/osgi/main/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/main/pom.xml?rev=397361&r1=397360&r2=397361&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/main/pom.xml (original)
+++ directory/trunks/apacheds/osgi/main/pom.xml Wed Apr 26 19:08:48 2006
@@ -9,29 +9,11 @@
   <artifactId>apacheds-osgi-main</artifactId>
   <name>ApacheDS OSGi Server Main</name>
   <packaging>jar</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.framework</artifactId>
-      <version>0.8.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  <properties>
-    <property name="install.home" value="${basedir.absolutePath}"/>
-  </properties>
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-      	<artifactId>maven-jar-plugin</artifactId>
-      	<configuration>
-      	  <archive>
-      	    <manifestFile>src/main/manifest/Manifest.mf</manifestFile>
-      	    <manifest>
-      	      <mainClass>org.apache.directory.server.Main</mainClass>
-      	    </manifest>
-      	  </archive>
-      	</configuration>
+        <artifactId>maven-jar-plugin</artifactId>
       </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -48,8 +30,8 @@
                 <mkdir dir="${basedir}/conf"/>
                 <delete dir="${basedir}/bundle"/>
                 <mkdir dir="${basedir}/bundle"/>
-                <copy file="${basedir}/target/apacheds-osgi-main-${pom.version}.jar" tofile="${basedir}/bin/felix.jar"/>
                 <copy file="${basedir}/target/classes/config.properties" todir="${basedir}/conf"/>
+                <copy file="${basedir}/target/classes/log4j.properties" todir="${basedir}/conf"/>
               </tasks>
             </configuration>
             <goals>
@@ -72,11 +54,18 @@
                 <artifactItems>
                   <artifactItem>
                      <groupId>org.apache.felix</groupId>
+                     <artifactId>org.apache.felix.main</artifactId>
+                     <version>0.8.0-SNAPSHOT</version>
+                     <type>jar</type>
+                     <outputDirectory>${basedir}/bin</outputDirectory>
+                     <destFileName>felix.jar</destFileName>
+                  </artifactItem>
+                  <artifactItem>
+                     <groupId>org.apache.felix</groupId>
                      <artifactId>org.apache.felix.framework</artifactId>
                      <version>0.8.0-SNAPSHOT</version>
                      <type>jar</type>
                      <outputDirectory>${basedir}/lib</outputDirectory>
-                     <!--<destFileName>optional-new-name.jar</destFileName>-->
                   </artifactItem>
                   <artifactItem>
                      <groupId>org.apache.felix</groupId>

Copied: directory/trunks/apacheds/osgi/main/src/main/resources/log4j.properties (from r396997,
directory/trunks/apacheds/osgi/main/log4j.properties)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/main/src/main/resources/log4j.properties?p2=directory/trunks/apacheds/osgi/main/src/main/resources/log4j.properties&p1=directory/trunks/apacheds/osgi/main/log4j.properties&r1=396997&r2=397361&rev=397361&view=diff
==============================================================================
    (empty)



Mime
View raw message