You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/01/19 16:54:17 UTC
svn commit: r1233443 - in /openejb/trunk/openejb/server: ./
openejb-common-cli/
openejb-common-cli/src/main/java/org/apache/openejb/server/cli/
openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/
openejb-common-cli/src/test/ openejb...
Author: rmannibucau
Date: Thu Jan 19 15:54:17 2012
New Revision: 1233443
URL: http://svn.apache.org/viewvc?rev=1233443&view=rev
Log:
we don't need openejb-script anymore since our scripting management is done through the JSR 223 and can be integrated in the cli
Added:
openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/OpenEJBScripter.java
- copied, changed from r1233430, openejb/trunk/openejb/server/openejb-script/src/main/java/org/apache/openejb/server/script/OpenEJBScripter.java
openejb/trunk/openejb/server/openejb-common-cli/src/test/
openejb/trunk/openejb/server/openejb-common-cli/src/test/java/
openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/
openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/
openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/
openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/
openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/
openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/Foo.java
openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/OpenEJBGroovyShellTest.java
openejb/trunk/openejb/server/openejb-common-cli/src/test/resources/
openejb/trunk/openejb/server/openejb-common-cli/src/test/resources/META-INF/
openejb/trunk/openejb/server/openejb-common-cli/src/test/resources/META-INF/beans.xml
Removed:
openejb/trunk/openejb/server/openejb-script/
Modified:
openejb/trunk/openejb/server/openejb-common-cli/pom.xml
openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/CliRunnable.java
openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptCommand.java
openejb/trunk/openejb/server/openejb-ssh/pom.xml
openejb/trunk/openejb/server/pom.xml
Modified: openejb/trunk/openejb/server/openejb-common-cli/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-common-cli/pom.xml?rev=1233443&r1=1233442&r2=1233443&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-common-cli/pom.xml (original)
+++ openejb/trunk/openejb/server/openejb-common-cli/pom.xml Thu Jan 19 15:54:17 2012
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openejb-script</artifactId>
+ <artifactId>openejb-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -28,5 +28,11 @@
<artifactId>gson</artifactId>
<version>2.1</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>2.0.0-beta-1</version>
+ <scope>test</scope> <!-- don't deliver it -->
+ </dependency>
</dependencies>
</project>
Modified: openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/CliRunnable.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/CliRunnable.java?rev=1233443&r1=1233442&r2=1233443&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/CliRunnable.java (original)
+++ openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/CliRunnable.java Thu Jan 19 15:54:17 2012
@@ -27,7 +27,6 @@ import org.apache.openejb.server.cli.com
import org.apache.openejb.server.cli.command.ScriptCommand;
import org.apache.openejb.server.cli.command.ScriptFileCommand;
import org.apache.openejb.server.cli.command.Undeploy;
-import org.apache.openejb.server.script.OpenEJBScripter;
import org.apache.xbean.recipe.ObjectRecipe;
import org.apache.xbean.recipe.Option;
Copied: openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/OpenEJBScripter.java (from r1233430, openejb/trunk/openejb/server/openejb-script/src/main/java/org/apache/openejb/server/script/OpenEJBScripter.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/OpenEJBScripter.java?p2=openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/OpenEJBScripter.java&p1=openejb/trunk/openejb/server/openejb-script/src/main/java/org/apache/openejb/server/script/OpenEJBScripter.java&r1=1233430&r2=1233443&rev=1233443&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-script/src/main/java/org/apache/openejb/server/script/OpenEJBScripter.java (original)
+++ openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/OpenEJBScripter.java Thu Jan 19 15:54:17 2012
@@ -1,4 +1,4 @@
-package org.apache.openejb.server.script;
+package org.apache.openejb.server.cli;
import org.apache.openejb.BeanContext;
import org.apache.openejb.loader.SystemInstance;
Modified: openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptCommand.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptCommand.java?rev=1233443&r1=1233442&r2=1233443&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptCommand.java (original)
+++ openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptCommand.java Thu Jan 19 15:54:17 2012
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.server.cli.command;
-import org.apache.openejb.server.script.OpenEJBScripter;
+import org.apache.openejb.server.cli.OpenEJBScripter;
public class ScriptCommand extends AbstractCommand {
public static final String SCRIPT_CMD = "script"; // use it instead of name() because of inheritance
Added: openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/Foo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/Foo.java?rev=1233443&view=auto
==============================================================================
--- openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/Foo.java (added)
+++ openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/Foo.java Thu Jan 19 15:54:17 2012
@@ -0,0 +1,13 @@
+package org.apache.openejb.server.groovy;
+
+import javax.ejb.Lock;
+import javax.ejb.LockType;
+import javax.ejb.Singleton;
+
+@Singleton
+@Lock(LockType.READ)
+public class Foo {
+ public String foo() {
+ return "foo";
+ }
+}
Added: openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/OpenEJBGroovyShellTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/OpenEJBGroovyShellTest.java?rev=1233443&view=auto
==============================================================================
--- openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/OpenEJBGroovyShellTest.java (added)
+++ openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/OpenEJBGroovyShellTest.java Thu Jan 19 15:54:17 2012
@@ -0,0 +1,48 @@
+/**
+ * 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.
+ */
+package org.apache.openejb.server.groovy;
+
+import org.apache.openejb.server.script.OpenEJBScripter;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.script.ScriptException;
+
+import static org.junit.Assert.assertEquals;
+
+public class OpenEJBGroovyShellTest {
+ private static EJBContainer container;
+
+ @BeforeClass
+ public static void start() {
+ container = EJBContainer.createEJBContainer();
+ }
+
+ @AfterClass
+ public static void close() {
+ container.close();
+ }
+
+ @Test
+ public void call() throws ScriptException {
+ final OpenEJBScripter shell = new OpenEJBScripter();
+ final Object out = shell.evaluate("groovy", "Foo.foo()");
+ assertEquals("foo", out);
+ }
+}
Added: openejb/trunk/openejb/server/openejb-common-cli/src/test/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-common-cli/src/test/resources/META-INF/beans.xml?rev=1233443&view=auto
==============================================================================
(empty)
Modified: openejb/trunk/openejb/server/openejb-ssh/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-ssh/pom.xml?rev=1233443&r1=1233442&r2=1233443&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-ssh/pom.xml (original)
+++ openejb/trunk/openejb/server/openejb-ssh/pom.xml Thu Jan 19 15:54:17 2012
@@ -38,11 +38,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openejb-groovy</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>openejb-common-cli</artifactId>
<version>${project.version}</version>
</dependency>
Modified: openejb/trunk/openejb/server/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/pom.xml?rev=1233443&r1=1233442&r2=1233443&view=diff
==============================================================================
--- openejb/trunk/openejb/server/pom.xml (original)
+++ openejb/trunk/openejb/server/pom.xml Thu Jan 19 15:54:17 2012
@@ -43,7 +43,6 @@
<module>openejb-cxf-transport</module>
<module>openejb-rest</module>
<module>openejb-ssh</module>
- <module>openejb-script</module>
<module>openejb-common-cli</module>
</modules>
</project>