directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r664439 - in /directory/installers/branches/bigbang: LAST_BIG_BANG_MERGE apacheds-noarch/apacheds.bat apacheds-noarch/apacheds.sh apacheds-noarch/pom.xml apacheds/pom.xml
Date Sun, 08 Jun 2008 04:38:08 GMT
Author: akarasulu
Date: Sat Jun  7 21:38:08 2008
New Revision: 664439

URL: http://svn.apache.org/viewvc?rev=664439&view=rev
Log:
[MERGE][654380:664438] from trunk to bigbang

Modified:
    directory/installers/branches/bigbang/LAST_BIG_BANG_MERGE
    directory/installers/branches/bigbang/apacheds-noarch/apacheds.bat
    directory/installers/branches/bigbang/apacheds-noarch/apacheds.sh
    directory/installers/branches/bigbang/apacheds-noarch/pom.xml
    directory/installers/branches/bigbang/apacheds/pom.xml

Modified: directory/installers/branches/bigbang/LAST_BIG_BANG_MERGE
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/LAST_BIG_BANG_MERGE?rev=664439&r1=664438&r2=664439&view=diff
==============================================================================
--- directory/installers/branches/bigbang/LAST_BIG_BANG_MERGE (original)
+++ directory/installers/branches/bigbang/LAST_BIG_BANG_MERGE Sat Jun  7 21:38:08 2008
@@ -7,6 +7,7 @@
    https://svn.apache.org/repos/asf/directory/installers/branches/bigbang/
 
 
+Sun Jun  8 00:34:21 EDT 2008
 ----------------------------
-svn merge -r : https://svn.apache.org/repos/asf/directory/installers/trunk .
+svn merge -r 654380:664438 https://svn.apache.org/repos/asf/directory/installers/trunk .
 

Modified: directory/installers/branches/bigbang/apacheds-noarch/apacheds.bat
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/apacheds-noarch/apacheds.bat?rev=664439&r1=664438&r2=664439&view=diff
==============================================================================
--- directory/installers/branches/bigbang/apacheds-noarch/apacheds.bat (original)
+++ directory/installers/branches/bigbang/apacheds-noarch/apacheds.bat Sat Jun  7 21:38:08
2008
@@ -3,7 +3,7 @@
 REM this script starts ApacheDS (as non-windows-service)
 
 
-IF NOT exist target/apacheds-noarch-installer-1.5.2-SNAPSHOT-app.jar GOTO :MVN
+IF NOT exist target/apacheds-noarch-installer-1.5.4-SNAPSHOT-app.jar GOTO :MVN
    echo uber jar exists
    GOTO :JAVA
 
@@ -13,4 +13,4 @@
    GOTO :JAVA
 
 :JAVA
-   java -Dlog4j.configuration="file:///%cd%/log4j.properties" -jar target/apacheds-noarch-installer-1.5.2-SNAPSHOT-app.jar
target/plan/server.xml
+   java -Dlog4j.configuration="file:///%cd%/log4j.properties" -jar target/apacheds-noarch-installer-1.5.4-SNAPSHOT-app.jar
target/plan/server.xml

Modified: directory/installers/branches/bigbang/apacheds-noarch/apacheds.sh
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/apacheds-noarch/apacheds.sh?rev=664439&r1=664438&r2=664439&view=diff
==============================================================================
--- directory/installers/branches/bigbang/apacheds-noarch/apacheds.sh (original)
+++ directory/installers/branches/bigbang/apacheds-noarch/apacheds.sh Sat Jun  7 21:38:08
2008
@@ -1,9 +1,9 @@
 #!/bin/sh
-if [ -e target/apacheds-noarch-installer-1.5.2-SNAPSHOT-app.jar ] ; then
+if [ -e target/apacheds-noarch-installer-1.5.4-SNAPSHOT-app.jar ] ; then
   echo uber jar exists
 else
   echo uber jar not found need to build it
   mvn clean install
 fi
 
-java -Dlog4j.debug -Dlog4j.configuration=file:./log4j.properties -jar target/apacheds-noarch-installer-1.5.2-SNAPSHOT-app.jar
target/plan/server.xml 
+java -Dlog4j.debug -Dlog4j.configuration=file:./log4j.properties -jar target/apacheds-noarch-installer-1.5.4-SNAPSHOT-app.jar
target/plan/server.xml 

Modified: directory/installers/branches/bigbang/apacheds-noarch/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/apacheds-noarch/pom.xml?rev=664439&r1=664438&r2=664439&view=diff
==============================================================================
--- directory/installers/branches/bigbang/apacheds-noarch/pom.xml (original)
+++ directory/installers/branches/bigbang/apacheds-noarch/pom.xml Sat Jun  7 21:38:08 2008
@@ -140,7 +140,7 @@
                 <artifactItem>
                   <groupId>org.apache.directory.server</groupId>
                   <artifactId>apacheds-server-xml</artifactId>
-                  <version>1.5.2</version>
+                  <version>${version}</version>
                 </artifactItem>
               </artifactItems>
               <outputDirectory>${basedir}/target/plan</outputDirectory>

Modified: directory/installers/branches/bigbang/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/apacheds/pom.xml?rev=664439&r1=664438&r2=664439&view=diff
==============================================================================
--- directory/installers/branches/bigbang/apacheds/pom.xml (original)
+++ directory/installers/branches/bigbang/apacheds/pom.xml Sat Jun  7 21:38:08 2008
@@ -14,7 +14,7 @@
   </description>
 
   <properties>
-    <studio-version>1.1.0</studio-version>
+    <studio-version>1.2.0.SNAPSHOT</studio-version>
     <server-version>1.5.4-SNAPSHOT</server-version>
     <suite-version>1.1.0</suite-version>
   </properties>



Mime
View raw message