openejb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r454542 - in /incubator/openejb/trunk/openejb3: assembly/openejb-standalone/ assembly/openejb-standalone/src/main/resources/ assembly/openejb-standalone/src/main/resources/empty/ container/openejb-core/ container/openejb-core/src/main/resou...
Date Mon, 09 Oct 2006 22:55:41 GMT
Author: jlaskowski
Date: Mon Oct  9 15:55:40 2006
New Revision: 454542

URL: http://svn.apache.org/viewvc?view=rev&rev=454542
Log:
More filtering
Polish translation for commands - non-EN and non-PL locales don't display command description
yet

Removed:
    incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/empty/
Modified:
    incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
    incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb
    incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb.bat
    incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/deploy
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/start
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/stop
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate
    incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java

Modified: incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml?view=diff&rev=454542&r1=454541&r2=454542
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml Mon Oct  9 15:55:40
2006
@@ -1,3 +1,21 @@
+<!--
+
+    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.
+
+-->
 
 <!-- $Rev$ $Date$ -->
 
@@ -13,6 +31,12 @@
   <packaging>jar</packaging>
   <name>OpenEJB :: Assembly :: Standalone</name>
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb?view=diff&rev=454542&r1=454541&r2=454542
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb
(original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb
Mon Oct  9 15:55:40 2006
@@ -13,7 +13,7 @@
 #             
 #               
 # ___________________________________________________________
-# $Id$
+# $Rev$ $Date$
 #============================================================
 
 cygwin=false
@@ -61,27 +61,29 @@
 
 OPTIONS="-Dopenejb.home=$OPENEJB_HOME"
 
+OPENEJB_CORE_JAR="$OPENEJB_HOME/lib/openejb-core-${pom.version}.jar"
+
 #============================================================
 _command_help()
 {
     case $2 in
         "validate")
-            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar validate --help
+            java -jar $OPENEJB_CORE_JAR validate --help
         ;;
         "deploy")
-            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar deploy --help
+            java -jar $OPENEJB_CORE_JAR deploy --help
         ;;
         "start")
-            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar start --help
+            java -jar $OPENEJB_CORE_JAR start --help
         ;;
         "stop")
-            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar stop --help
+            java -jar $OPENEJB_CORE_JAR stop --help
         ;;
         "test")
-            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar test --help
+            java -jar $OPENEJB_CORE_JAR test --help
         ;;
         *)
-            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar
+            java -jar $OPENEJB_CORE_JAR
         ;;
     esac
 }
@@ -89,33 +91,33 @@
 _command_deploy()
 {
    shift
-   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar deploy $@
+   java -jar $OPENEJB_CORE_JAR deploy $@
 }
 #============================================================
 _command_validate()
 {
    shift
-   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar validate $@
+   java -jar $OPENEJB_CORE_JAR validate $@
 }
 #============================================================
 _command_start()
 {
-   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar start $@
+   java -jar $OPENEJB_CORE_JARr start $@
 }
 #============================================================
 _command_stop()
 {
-   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar stop $@
+   java -jar $OPENEJB_CORE_JAR stop $@
 }
 #============================================================
 _test_intravm()
 {
-   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar test local
+   java -jar $OPENEJB_CORE_JAR test local
 }
 #============================================================
 _test_server()
 {
-   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar test remote
+   java -jar $OPENEJB_CORE_JAR test remote
 }
 #============================================================
 _command_test()
@@ -138,7 +140,7 @@
 #============================================================
 _test_help()
 {
-   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar test --help
+   java -jar $OPENEJB_CORE_JAR test --help
 }
 #============================================================
 _test_noargs()

Modified: incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb.bat
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb.bat?view=diff&rev=454542&r1=454541&r2=454542
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb.bat
(original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb.bat
Mon Oct  9 15:55:40 2006
@@ -12,14 +12,16 @@
 REM   Created by David Blevins 
 REM             <david.blevins@visi.com>
 REM _______________________________________________
-REM $Id$
+REM $Rev$ $Date$
 REM================================================
 
 SETLOCAL
 
+set OPENEJB_CORE_JAR=%OPENEJB_HOME%/lib/openejb-core-${pom.version}.jar
+
 rem find OPENEJB_HOME if it does not exist due to either an invalid value passed
 rem by the user or the %0 problem on Windows 9x
-if exist "%OPENEJB_HOME%\lib\openejb-core-*.jar" goto openejbHomeSet
+if exist "%OPENEJB_CORE_JAR%" goto openejbHomeSet
 
 :noOpenEJBHome
 echo OPENEJB_HOME is set incorrectly or OpenEJB could not be located. Please set OPENEJB_HOME.
@@ -44,7 +46,7 @@
 REM================================================
 :HELP
    
-	java -jar %OPENEJB_HOME%/lib/openejb-core-@REPLACED-BY-MAVEN-XML@.jar
+	java -jar %OPENEJB_CORE_JAR%
 
 goto EOF
 REM================================================
@@ -61,25 +63,25 @@
 REM================================================
 :VALIDATE 
    shift
-   java -jar %OPENEJB_HOME%/lib/openejb-core-@REPLACED-BY-MAVEN-XML@.jar validate %1 %2 %3
%4 %5 %6 %7 %8 %9
+   java -jar %OPENEJB_CORE_JAR% validate %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 goto EOF
 REM================================================
 :DEPLOY 
    shift
-   java -jar %OPENEJB_HOME%/lib/openejb-core-@REPLACED-BY-MAVEN-XML@.jar deploy %1 %2 %3
%4 %5 %6 %7 %8 %9
+   java -jar %OPENEJB_CORE_JAR% deploy %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 goto EOF
 REM================================================
 :START_SERVER
    shift
-   java -jar %OPENEJB_HOME%/lib/openejb-core-@REPLACED-BY-MAVEN-XML@.jar start %1 %2 %3 %4
%5 %6 %7 %8 %9
+   java -jar %OPENEJB_CORE_JAR% start %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 goto EOF
 REM================================================
 :STOP_SERVER
    shift
-   java -jar %OPENEJB_HOME%/lib/openejb-core-@REPLACED-BY-MAVEN-XML@.jar stop %1 %2 %3 %4
%5 %6 %7 %8 %9
+   java -jar %OPENEJB_CORE_JAR% stop %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 goto EOF
 REM================================================
@@ -89,44 +91,44 @@
 REM================================================
 :TEST_INTRAVM
 
-   java -jar %OPENEJB_HOME%/lib/openejb-core-@REPLACED-BY-MAVEN-XML@.jar test local
+   java -jar %OPENEJB_CORE_JAR% test local
          
 if /I %P2% EQU _ goto TEST_SERVER
 goto EOF
 REM================================================
 :TEST_SERVER
 
-   java -jar %OPENEJB_HOME%/lib/openejb-core-@REPLACED-BY-MAVEN-XML@.jar test remote
+   java -jar %OPENEJB_CORE_JAR% test remote
    
 goto EOF
 REM================================================
 :HELP_TEST
    
-	java -jar %OPENEJB_HOME%/lib/openejb-core-@REPLACED-BY-MAVEN-XML@.jar test --help
+	java -jar %OPENEJB_CORE_JAR% test --help
 
 goto EOF
 REM================================================
 :HELP_DEPLOY
    
-	java -jar %OPENEJB_HOME%/lib/openejb-core-@REPLACED-BY-MAVEN-XML@.jar deploy --help
+	java -jar %OPENEJB_CORE_JAR% deploy --help
 	
 goto EOF
 REM================================================
 :HELP_VALIDATE
    
-	java -jar %OPENEJB_HOME%/lib/openejb-core-@REPLACED-BY-MAVEN-XML@.jar validate --help
+	java -jar %OPENEJB_CORE_JAR% validate --help
 
 goto EOF
 REM================================================
 :HELP_START
    
-	java -jar %OPENEJB_HOME%/lib/openejb-core-@REPLACED-BY-MAVEN-XML@.jar start --help
+	java -jar %OPENEJB_CORE_JAR% start --help
 
 goto EOF
 REM================================================
 :HELP_STOP
    
-	java -jar %OPENEJB_HOME%/lib/openejb-core-@REPLACED-BY-MAVEN-XML@.jar stop --help
+	java -jar %OPENEJB_CORE_JAR% stop --help
 
 goto EOF
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml?view=diff&rev=454542&r1=454541&r2=454542
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml Mon Oct  9 15:55:40 2006
@@ -85,7 +85,7 @@
               <!--<addClasspath>true</addClasspath>-->
             </manifest>
             <manifestEntries>
-              <Class-Path>openejb-loader-3.0-incubating-SNAPSHOT.jar xbean-finder-2.6.jar</Class-Path>
+              <Class-Path>openejb-loader-${pom.version}.jar xbean-finder-2.6.jar</Class-Path>
             </manifestEntries>
           </archive>
         </configuration>

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/deploy
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/deploy?view=diff&rev=454542&r1=454541&r2=454542
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/deploy
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/deploy
Mon Oct  9 15:55:40 2006
@@ -1,3 +1,5 @@
 main.class = org.apache.openejb.alt.config.Deploy
 name = deploy
-description = Deploy an ejb jar into OpenEJB.
\ No newline at end of file
+description = Deploy an ejb jar into OpenEJB.
+description.pl = Zainstaluj ejb jar w OpenEJB
+

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/start
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/start?view=diff&rev=454542&r1=454541&r2=454542
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/start
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/start
Mon Oct  9 15:55:40 2006
@@ -1,3 +1,5 @@
 main.class = org.apache.openejb.server.Main
 name = start
-description = Start the OpenEJB Remote Server for accessing beans in client/server mode.
\ No newline at end of file
+description = Start the OpenEJB Remote Server for accessing beans in client/server mode.
+description.pl = Uruchom OpenEJB Remote Server udost\u0119pniaj\u0105c komponenty EJB w trybie
klient/serwer.
+

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/stop
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/stop?view=diff&rev=454542&r1=454541&r2=454542
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/stop
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/stop
Mon Oct  9 15:55:40 2006
@@ -1,3 +1,5 @@
 main.class = org.apache.openejb.server.admin.Stop
 name = stop
-description = Stop the OpenEJB Remote Server.
\ No newline at end of file
+description = Stop the OpenEJB Remote Server.
+description.pl = Zatrzymaj OpenEJB Remote Server.
+

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate?view=diff&rev=454542&r1=454541&r2=454542
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate
Mon Oct  9 15:55:40 2006
@@ -1,3 +1,5 @@
 main.class = org.apache.openejb.alt.config.EjbValidator
 name = validate
-description = Validate an ejb jar
\ No newline at end of file
+description = Validate an ejb jar
+description.pl = Sprawd\u017a poprawno\u015b\u0107 ejb jar
+

Modified: incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java?view=diff&rev=454542&r1=454541&r2=454542
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
(original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
Mon Oct  9 15:55:40 2006
@@ -43,8 +43,11 @@
     public static void main(String args[]) {
 
         try {
-            PropertiesService propertiesService = (PropertiesService) factory.getBean("propertiesService");
+            // Parse command-line arguments before OpenEJB is assembled by XBean
+            // Some arguments cause DontStartServerException to be thrown
             Properties props = parseArguments(args);
+
+            PropertiesService propertiesService = (PropertiesService) factory.getBean("propertiesService");
             // FIXME: Remove parseArguments and let propertiesService take care of properties
mgmt
             propertiesService.putAll(props);
             



Mime
View raw message