removing ^M (windows eol)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fa0d3745 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fa0d3745 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fa0d3745 Branch: refs/heads/tomee-7.0.0-M1 Commit: fa0d3745ce78d5edb4e9dd0d4c786458bd32074f Parents: 6e2a4f7 Author: Thiago Veronezi <[email protected]> Authored: Mon Nov 23 17:31:57 2015 -0500 Committer: Thiago Veronezi <[email protected]> Committed: Mon Nov 23 17:31:57 2015 -0500 ---------------------------------------------------------------------- .../embedded/MultipleDeploymentsTest.java | 164 ++--- .../conf/Catalina/localhost/ROOT.xml | 82 +-- .../conf/Catalina/localhost/ROOT.xml | 82 +-- .../arquillian/tests/jms/DummyManagedBean.java | 112 +-- .../arquillian/tests/jms/JMSInjectionTest.java | 158 ++-- .../tests/jsf/jpa/DummyManagedBean.java | 88 +-- .../tests/jsf/jpa/JPAInjectionTest.java | 158 ++-- assembly/openejb-standalone/README.html | 42 +- .../src/main/assembly/component.xml | 42 +- .../src/main/assembly/dos.xml | 250 +++---- .../src/main/assembly/unix.xml | 246 +++---- .../src/main/resources/Start.bat | 66 +- .../src/main/resources/Stop.bat | 66 +- .../main/resources/service.install.as.admin.bat | 300 ++++---- .../main/resources/service.remove.as.admin.bat | 96 +-- assembly/test/build.xml | 724 +++++++++---------- .../classic/EntityManagerFactoryCallable.java | 202 +++--- .../apache/openejb/cipher/PasswordCipher.java | 102 +-- .../openejb/cipher/PlainTextPasswordCipher.java | 108 +-- .../openejb/cipher/StaticDESPasswordCipher.java | 194 ++--- .../apache/openejb/classloader/FalseFilter.java | 58 +- .../openejb/config/DeploymentFilterable.java | 66 +- .../openejb/config/rules/CheckAnnotations.java | 190 ++--- .../rules/CheckIncorrectPropertyNames.java | 168 ++--- .../injection/FallbackPropertyInjector.java | 48 +- .../openejb/persistence/QueryOperation.java | 48 +- .../resource/activemq/ActiveMQFactory.java | 308 ++++---- .../openejb/resource/jdbc/RoutedDataSource.java | 258 +++---- .../resource/jdbc/cipher/PasswordCipher.java | 58 +- .../jdbc/cipher/PlainTextPasswordCipher.java | 44 +- .../jdbc/cipher/StaticDESPasswordCipher.java | 46 +- .../resource/jdbc/router/AbstractRouter.java | 84 +-- .../openejb/resource/jdbc/router/Router.java | 74 +- .../openejb/rest/ThreadLocalContextManager.java | 226 +++--- 34 files changed, 2479 insertions(+), 2479 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/MultipleDeploymentsTest.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/MultipleDeploymentsTest.java b/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/MultipleDeploymentsTest.java index e6b3a4d..d2329e2 100644 --- a/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/MultipleDeploymentsTest.java +++ b/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/MultipleDeploymentsTest.java @@ -1,82 +1,82 @@ -/* - * 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.arquillian.embedded; - -import org.apache.tomee.catalina.environment.Hosts; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OperateOnDeployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; - -import javax.inject.Inject; - -@RunWith(Arquillian.class) -public class MultipleDeploymentsTest extends Assert { - - public static final String MSG = "HelloWorld"; - - @Deployment(name = "orange") - public static WebArchive orange() { - return ShrinkWrap.create(WebArchive.class, "orange.war") - .addClasses( - TestMe.class, - Hosts.class) - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); - } - - @Deployment(name = "green") - public static WebArchive green() { - return ShrinkWrap.create(WebArchive.class, "green.war"); - } - - @Deployment(name = "blue") - public static WebArchive blue() { - return ShrinkWrap.create(WebArchive.class, "blue.war"); - } - - @Deployment(name = "yellow") - public static WebArchive yellow() { - return ShrinkWrap.create(WebArchive.class, "yellow.war"); - } - - @Test - @OperateOnDeployment("orange") - public void testOrange(final TestMe testMe) throws Exception { - assertNotNull(testMe); - assertEquals("Unexpected message", MSG, testMe.getMessage()); - } - - @Test - @OperateOnDeployment("green") - public void testMap() throws Exception { - // no-op - } - - public static class TestMe { - public TestMe() { - } - - public String getMessage() { - return MSG; - } - } -} +/* + * 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.arquillian.embedded; + +import org.apache.tomee.catalina.environment.Hosts; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; + +import javax.inject.Inject; + +@RunWith(Arquillian.class) +public class MultipleDeploymentsTest extends Assert { + + public static final String MSG = "HelloWorld"; + + @Deployment(name = "orange") + public static WebArchive orange() { + return ShrinkWrap.create(WebArchive.class, "orange.war") + .addClasses( + TestMe.class, + Hosts.class) + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); + } + + @Deployment(name = "green") + public static WebArchive green() { + return ShrinkWrap.create(WebArchive.class, "green.war"); + } + + @Deployment(name = "blue") + public static WebArchive blue() { + return ShrinkWrap.create(WebArchive.class, "blue.war"); + } + + @Deployment(name = "yellow") + public static WebArchive yellow() { + return ShrinkWrap.create(WebArchive.class, "yellow.war"); + } + + @Test + @OperateOnDeployment("orange") + public void testOrange(final TestMe testMe) throws Exception { + assertNotNull(testMe); + assertEquals("Unexpected message", MSG, testMe.getMessage()); + } + + @Test + @OperateOnDeployment("green") + public void testMap() throws Exception { + // no-op + } + + public static class TestMe { + public TestMe() { + } + + public String getMessage() { + return MSG; + } + } +} http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/resources/tomee-embedded/conf/Catalina/localhost/ROOT.xml ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/resources/tomee-embedded/conf/Catalina/localhost/ROOT.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/resources/tomee-embedded/conf/Catalina/localhost/ROOT.xml index 69d4c2b..bfd7fc8 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/resources/tomee-embedded/conf/Catalina/localhost/ROOT.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/resources/tomee-embedded/conf/Catalina/localhost/ROOT.xml @@ -1,42 +1,42 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - - 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. ---> -<Context path="" crossContext="true"> - - <!-- JAAS --> - - <!--<Realm - className="org.apache.catalina.realm.JAASRealm" - appName="PortalRealm" - userClassNames="com.liferay.portal.kernel.security.jaas.PortalPrincipal" - roleClassNames="com.liferay.portal.kernel.security.jaas.PortalRole" - />--> - - <!-- - Uncomment the following to disable persistent sessions across reboots. - --> - - <!--<Manager pathname="" />--> - - <!-- - Uncomment the following to not use sessions. See the property - "session.disabled" in portal.properties. - --> - - <!--<Manager className="com.liferay.support.tomcat.session.SessionLessManagerBase" />--> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + + 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. +--> +<Context path="" crossContext="true"> + + <!-- JAAS --> + + <!--<Realm + className="org.apache.catalina.realm.JAASRealm" + appName="PortalRealm" + userClassNames="com.liferay.portal.kernel.security.jaas.PortalPrincipal" + roleClassNames="com.liferay.portal.kernel.security.jaas.PortalRole" + />--> + + <!-- + Uncomment the following to disable persistent sessions across reboots. + --> + + <!--<Manager pathname="" />--> + + <!-- + Uncomment the following to not use sessions. See the property + "session.disabled" in portal.properties. + --> + + <!--<Manager className="com.liferay.support.tomcat.session.SessionLessManagerBase" />--> </Context> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/resources/tomee-remote/conf/Catalina/localhost/ROOT.xml ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/resources/tomee-remote/conf/Catalina/localhost/ROOT.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/resources/tomee-remote/conf/Catalina/localhost/ROOT.xml index 69d4c2b..bfd7fc8 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/resources/tomee-remote/conf/Catalina/localhost/ROOT.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/src/test/resources/tomee-remote/conf/Catalina/localhost/ROOT.xml @@ -1,42 +1,42 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - - 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. ---> -<Context path="" crossContext="true"> - - <!-- JAAS --> - - <!--<Realm - className="org.apache.catalina.realm.JAASRealm" - appName="PortalRealm" - userClassNames="com.liferay.portal.kernel.security.jaas.PortalPrincipal" - roleClassNames="com.liferay.portal.kernel.security.jaas.PortalRole" - />--> - - <!-- - Uncomment the following to disable persistent sessions across reboots. - --> - - <!--<Manager pathname="" />--> - - <!-- - Uncomment the following to not use sessions. See the property - "session.disabled" in portal.properties. - --> - - <!--<Manager className="com.liferay.support.tomcat.session.SessionLessManagerBase" />--> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + + 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. +--> +<Context path="" crossContext="true"> + + <!-- JAAS --> + + <!--<Realm + className="org.apache.catalina.realm.JAASRealm" + appName="PortalRealm" + userClassNames="com.liferay.portal.kernel.security.jaas.PortalPrincipal" + roleClassNames="com.liferay.portal.kernel.security.jaas.PortalRole" + />--> + + <!-- + Uncomment the following to disable persistent sessions across reboots. + --> + + <!--<Manager pathname="" />--> + + <!-- + Uncomment the following to not use sessions. See the property + "session.disabled" in portal.properties. + --> + + <!--<Manager className="com.liferay.support.tomcat.session.SessionLessManagerBase" />--> </Context> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/DummyManagedBean.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/DummyManagedBean.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/DummyManagedBean.java index b9d5b5a..7030ae9 100755 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/DummyManagedBean.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/DummyManagedBean.java @@ -1,56 +1,56 @@ -/** - * 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.arquillian.tests.jms; - -import javax.annotation.Resource; -import javax.faces.bean.ManagedBean; -import javax.jms.ConnectionFactory; -import javax.jms.Queue; -import javax.jms.Topic; - -@ManagedBean -public class DummyManagedBean { - @Resource - private Queue queue; - - @Resource - private Topic topic; - - @Resource - private ConnectionFactory connectionFactory; - - public String getFoo() { - if (queue != null) { - return "queueInjected"; - } - return "queueNotInjected"; - } - - public String getBoo() { - if (topic != null) { - return "topicInjected"; - } - return "topicNotInjected"; - } - - public String getBaz() { - if (connectionFactory != null) { - return "connectionFactoryInjected"; - } - return "connectionFactoryNotInjected"; - } -} +/** + * 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.arquillian.tests.jms; + +import javax.annotation.Resource; +import javax.faces.bean.ManagedBean; +import javax.jms.ConnectionFactory; +import javax.jms.Queue; +import javax.jms.Topic; + +@ManagedBean +public class DummyManagedBean { + @Resource + private Queue queue; + + @Resource + private Topic topic; + + @Resource + private ConnectionFactory connectionFactory; + + public String getFoo() { + if (queue != null) { + return "queueInjected"; + } + return "queueNotInjected"; + } + + public String getBoo() { + if (topic != null) { + return "topicInjected"; + } + return "topicNotInjected"; + } + + public String getBaz() { + if (connectionFactory != null) { + return "connectionFactoryInjected"; + } + return "connectionFactoryNotInjected"; + } +} http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java index 30d8426..4d7ca40 100755 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java @@ -1,79 +1,79 @@ -/** - * 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.arquillian.tests.jms; - -import org.apache.openejb.loader.IO; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor; -import org.junit.Test; -import org.junit.runner.RunWith; - -import javax.faces.webapp.FacesServlet; -import java.io.IOException; -import java.net.URL; - -import static org.junit.Assert.assertTrue; - -@RunWith(Arquillian.class) -public class JMSInjectionTest { - - @ArquillianResource - private URL url; - - @Deployment(testable = false) - public static WebArchive getArchive() { - - return ShrinkWrap.create(WebArchive.class, "jsf-jms-test.war") - .addClasses(DummyManagedBean.class) - .addAsWebResource(new ClassLoaderAsset( - JMSInjectionTest.class.getPackage().getName().replace('.', '/').concat("/").concat("dummy.xhtml")), "dummy.xhtml") - .setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class) - .version("3.0") - .createServlet() - .servletName("jsf") - .servletClass(FacesServlet.class.getName()) - .loadOnStartup(1) - .up() - .createServletMapping() - .servletName("jsf") - .urlPattern("*.xhtml") // not the default - .up() - .exportAsString())); - } - - @Test - public void testJMSInjection() throws Exception { - validateTest("queueInjected"); - validateTest("topicInjected"); - validateTest("connectionFactoryInjected"); - } - - private void validateTest(final String expectedOutput) throws IOException { - final String output = IO.slurp(new URL(url.toExternalForm() + "dummy.xhtml")); - assertTrue("Output should contain: " + expectedOutput + "; and not " + output, output.contains(expectedOutput)); - } - - -} +/** + * 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.arquillian.tests.jms; + +import org.apache.openejb.loader.IO; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.descriptor.api.Descriptors; +import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor; +import org.junit.Test; +import org.junit.runner.RunWith; + +import javax.faces.webapp.FacesServlet; +import java.io.IOException; +import java.net.URL; + +import static org.junit.Assert.assertTrue; + +@RunWith(Arquillian.class) +public class JMSInjectionTest { + + @ArquillianResource + private URL url; + + @Deployment(testable = false) + public static WebArchive getArchive() { + + return ShrinkWrap.create(WebArchive.class, "jsf-jms-test.war") + .addClasses(DummyManagedBean.class) + .addAsWebResource(new ClassLoaderAsset( + JMSInjectionTest.class.getPackage().getName().replace('.', '/').concat("/").concat("dummy.xhtml")), "dummy.xhtml") + .setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class) + .version("3.0") + .createServlet() + .servletName("jsf") + .servletClass(FacesServlet.class.getName()) + .loadOnStartup(1) + .up() + .createServletMapping() + .servletName("jsf") + .urlPattern("*.xhtml") // not the default + .up() + .exportAsString())); + } + + @Test + public void testJMSInjection() throws Exception { + validateTest("queueInjected"); + validateTest("topicInjected"); + validateTest("connectionFactoryInjected"); + } + + private void validateTest(final String expectedOutput) throws IOException { + final String output = IO.slurp(new URL(url.toExternalForm() + "dummy.xhtml")); + assertTrue("Output should contain: " + expectedOutput + "; and not " + output, output.contains(expectedOutput)); + } + + +} http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/DummyManagedBean.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/DummyManagedBean.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/DummyManagedBean.java index ca23c05..edce25f 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/DummyManagedBean.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/DummyManagedBean.java @@ -1,44 +1,44 @@ -/** - * 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.arquillian.tests.jsf.jpa; - -import javax.faces.bean.ManagedBean; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceContext; -import javax.persistence.PersistenceUnit; - -@ManagedBean -public class DummyManagedBean { - @PersistenceUnit(unitName ="test-pu") - EntityManagerFactory emf; - - @PersistenceContext(unitName ="test-pu") - EntityManager em; - - public String getFoo() - { - if(emf!=null){return "emfInjected";} - return "emfNotInjected"; - } - - public String getBoo() - { - if(em!=null){return "emInjected";} - return "emNotInjected"; - } -} +/** + * 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.arquillian.tests.jsf.jpa; + +import javax.faces.bean.ManagedBean; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.PersistenceContext; +import javax.persistence.PersistenceUnit; + +@ManagedBean +public class DummyManagedBean { + @PersistenceUnit(unitName ="test-pu") + EntityManagerFactory emf; + + @PersistenceContext(unitName ="test-pu") + EntityManager em; + + public String getFoo() + { + if(emf!=null){return "emfInjected";} + return "emfNotInjected"; + } + + public String getBoo() + { + if(em!=null){return "emInjected";} + return "emNotInjected"; + } +} http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java index 07b476a..1bf0133 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java @@ -1,79 +1,79 @@ -/** - * 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.arquillian.tests.jsf.jpa; - -import org.apache.openejb.arquillian.tests.jsf.JSFs; -import org.apache.openejb.loader.IO; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.asset.Asset; -import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor; -import org.junit.Test; -import org.junit.runner.RunWith; - -import java.io.IOException; -import java.net.URL; - -import static org.junit.Assert.assertTrue; - -@RunWith(Arquillian.class) -public class JPAInjectionTest extends JSFs { - - @ArquillianResource - private URL url; - - @Deployment(testable = false) - public static WebArchive getArchive() { - PersistenceDescriptor persistenceDescriptor = Descriptors.create(PersistenceDescriptor.class) - .createPersistenceUnit() - .name("test-pu") - .transactionType("JTA") - .clazz(PersistenceDescriptor.class.getName()) - .jtaDataSource("test-ds") - .up(); - - - Asset persistenceAsset = new StringAsset(persistenceDescriptor.exportAsString()); - return base("jsf-jpa-test.war").addAsWebInfResource(persistenceAsset, "persistence.xml") - .addClasses(DummyManagedBean.class) - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - .addAsWebResource(new ClassLoaderAsset( - JPAInjectionTest.class.getPackage().getName().replace('.', '/').concat("/").concat("dummy.xhtml")), "dummy.xhtml"); - - - } - - @Test - public void testJPAInjection() throws Exception { - validateTest("emfInjected"); - validateTest("emInjected"); - } - - private void validateTest(final String expectedOutput) throws IOException { - final String output = IO.slurp(new URL(url.toExternalForm() + "dummy.xhtml")); - assertTrue("Output should contain: " + expectedOutput + "; and not " + output, output.contains(expectedOutput)); - } - - -} +/** + * 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.arquillian.tests.jsf.jpa; + +import org.apache.openejb.arquillian.tests.jsf.JSFs; +import org.apache.openejb.loader.IO; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.asset.Asset; +import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.descriptor.api.Descriptors; +import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.io.IOException; +import java.net.URL; + +import static org.junit.Assert.assertTrue; + +@RunWith(Arquillian.class) +public class JPAInjectionTest extends JSFs { + + @ArquillianResource + private URL url; + + @Deployment(testable = false) + public static WebArchive getArchive() { + PersistenceDescriptor persistenceDescriptor = Descriptors.create(PersistenceDescriptor.class) + .createPersistenceUnit() + .name("test-pu") + .transactionType("JTA") + .clazz(PersistenceDescriptor.class.getName()) + .jtaDataSource("test-ds") + .up(); + + + Asset persistenceAsset = new StringAsset(persistenceDescriptor.exportAsString()); + return base("jsf-jpa-test.war").addAsWebInfResource(persistenceAsset, "persistence.xml") + .addClasses(DummyManagedBean.class) + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + .addAsWebResource(new ClassLoaderAsset( + JPAInjectionTest.class.getPackage().getName().replace('.', '/').concat("/").concat("dummy.xhtml")), "dummy.xhtml"); + + + } + + @Test + public void testJPAInjection() throws Exception { + validateTest("emfInjected"); + validateTest("emInjected"); + } + + private void validateTest(final String expectedOutput) throws IOException { + final String output = IO.slurp(new URL(url.toExternalForm() + "dummy.xhtml")); + assertTrue("Output should contain: " + expectedOutput + "; and not " + output, output.contains(expectedOutput)); + } + + +} http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/assembly/openejb-standalone/README.html ---------------------------------------------------------------------- diff --git a/assembly/openejb-standalone/README.html b/assembly/openejb-standalone/README.html index aaeb6a5..04f4504 100644 --- a/assembly/openejb-standalone/README.html +++ b/assembly/openejb-standalone/README.html @@ -1,24 +1,24 @@ -<!-- - - 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$ --> - +<!-- + + 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$ --> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <HTML><HEAD><TITLE>Apache OpenEJB 6.0.14</TITLE> <META http-equiv=Content-Type content="text/html"> http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/assembly/openejb-standalone/src/main/assembly/component.xml ---------------------------------------------------------------------- diff --git a/assembly/openejb-standalone/src/main/assembly/component.xml b/assembly/openejb-standalone/src/main/assembly/component.xml index 81e9b5c..9687511 100644 --- a/assembly/openejb-standalone/src/main/assembly/component.xml +++ b/assembly/openejb-standalone/src/main/assembly/component.xml @@ -1,22 +1,22 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<component> - +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<component> + </component> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/assembly/openejb-standalone/src/main/assembly/dos.xml ---------------------------------------------------------------------- diff --git a/assembly/openejb-standalone/src/main/assembly/dos.xml b/assembly/openejb-standalone/src/main/assembly/dos.xml index b2b5e46..538e924 100644 --- a/assembly/openejb-standalone/src/main/assembly/dos.xml +++ b/assembly/openejb-standalone/src/main/assembly/dos.xml @@ -1,125 +1,125 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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: 1482826 $ $Date: 2013-05-15 15:31:58 +0200 (Wed, 15 May 2013) $ --> - -<assembly> - <id>bin-dos</id> - <formats> - <format>zip</format> - </formats> - <fileSets> - <fileSet> - <lineEnding>dos</lineEnding> - <directory>${basedir}/target/classes</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>README.txt</include> - <include>NOTICE</include> - <include>LICENSE</include> - </includes> - </fileSet> - <fileSet> - <directory>${basedir}/target/classes</directory> - <outputDirectory>bin/</outputDirectory> - <includes> - <include>*.bat</include> - <include>service.readme.txt</include> - </includes> - <lineEnding>dos</lineEnding> - <fileMode>0755</fileMode> - </fileSet> - <fileSet> - <directory>${basedir}/target/classes</directory> - <outputDirectory>bin/</outputDirectory> - <includes> - <include>openejb</include> - </includes> - <lineEnding>unix</lineEnding> - <fileMode>0755</fileMode> - </fileSet> - <fileSet> - <directory>${basedir}/src/main/resources</directory> - <outputDirectory>bin/</outputDirectory> - <includes> - <include>*.exe</include> - </includes> - </fileSet> - <fileSet> - <lineEnding>dos</lineEnding> - <directory>${basedir}/src/main/conf</directory> - <includes> - <include>README.txt</include> - <include>logging.properties</include> - <include>system.properties</include> - </includes> - <outputDirectory>conf/</outputDirectory> - </fileSet> - <fileSet> - <lineEnding>dos</lineEnding> - <outputDirectory>logs/</outputDirectory> - <directory>${project.basedir}/src/main/assembly</directory> - <excludes> - <exclude>component.xml</exclude> - <exclude>dos.xml</exclude> - <exclude>unix.xml</exclude> - </excludes> - </fileSet> - <fileSet> - <lineEnding>dos</lineEnding> - <outputDirectory>apps/</outputDirectory> - <directory>${project.basedir}/src/main/assembly</directory> - <excludes> - <exclude>component.xml</exclude> - <exclude>dos.xml</exclude> - <exclude>unix.xml</exclude> - </excludes> - </fileSet> - <fileSet> - <outputDirectory>data/</outputDirectory> - <directory>${project.basedir}/src/main/assembly</directory> - <excludes> - <exclude>component.xml</exclude> - <exclude>dos.xml</exclude> - <exclude>unix.xml</exclude> - </excludes> - </fileSet> - </fileSets> - <files> - <file> - <lineEnding>dos</lineEnding> - <source>${basedir}/target/classes/DATA-README.txt</source> - <outputDirectory>data/</outputDirectory> - <destName>README.txt</destName> - <fileMode>0755</fileMode> - </file> - </files> - <dependencySets> - <dependencySet> - <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension} - </outputFileNameMapping> - <outputDirectory>lib</outputDirectory> - <scope>runtime</scope> - <excludes> - <exclude>junit:junit</exclude> - </excludes> - </dependencySet> - </dependencySets> -</assembly> - +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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: 1482826 $ $Date: 2013-05-15 15:31:58 +0200 (Wed, 15 May 2013) $ --> + +<assembly> + <id>bin-dos</id> + <formats> + <format>zip</format> + </formats> + <fileSets> + <fileSet> + <lineEnding>dos</lineEnding> + <directory>${basedir}/target/classes</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>README.txt</include> + <include>NOTICE</include> + <include>LICENSE</include> + </includes> + </fileSet> + <fileSet> + <directory>${basedir}/target/classes</directory> + <outputDirectory>bin/</outputDirectory> + <includes> + <include>*.bat</include> + <include>service.readme.txt</include> + </includes> + <lineEnding>dos</lineEnding> + <fileMode>0755</fileMode> + </fileSet> + <fileSet> + <directory>${basedir}/target/classes</directory> + <outputDirectory>bin/</outputDirectory> + <includes> + <include>openejb</include> + </includes> + <lineEnding>unix</lineEnding> + <fileMode>0755</fileMode> + </fileSet> + <fileSet> + <directory>${basedir}/src/main/resources</directory> + <outputDirectory>bin/</outputDirectory> + <includes> + <include>*.exe</include> + </includes> + </fileSet> + <fileSet> + <lineEnding>dos</lineEnding> + <directory>${basedir}/src/main/conf</directory> + <includes> + <include>README.txt</include> + <include>logging.properties</include> + <include>system.properties</include> + </includes> + <outputDirectory>conf/</outputDirectory> + </fileSet> + <fileSet> + <lineEnding>dos</lineEnding> + <outputDirectory>logs/</outputDirectory> + <directory>${project.basedir}/src/main/assembly</directory> + <excludes> + <exclude>component.xml</exclude> + <exclude>dos.xml</exclude> + <exclude>unix.xml</exclude> + </excludes> + </fileSet> + <fileSet> + <lineEnding>dos</lineEnding> + <outputDirectory>apps/</outputDirectory> + <directory>${project.basedir}/src/main/assembly</directory> + <excludes> + <exclude>component.xml</exclude> + <exclude>dos.xml</exclude> + <exclude>unix.xml</exclude> + </excludes> + </fileSet> + <fileSet> + <outputDirectory>data/</outputDirectory> + <directory>${project.basedir}/src/main/assembly</directory> + <excludes> + <exclude>component.xml</exclude> + <exclude>dos.xml</exclude> + <exclude>unix.xml</exclude> + </excludes> + </fileSet> + </fileSets> + <files> + <file> + <lineEnding>dos</lineEnding> + <source>${basedir}/target/classes/DATA-README.txt</source> + <outputDirectory>data/</outputDirectory> + <destName>README.txt</destName> + <fileMode>0755</fileMode> + </file> + </files> + <dependencySets> + <dependencySet> + <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension} + </outputFileNameMapping> + <outputDirectory>lib</outputDirectory> + <scope>runtime</scope> + <excludes> + <exclude>junit:junit</exclude> + </excludes> + </dependencySet> + </dependencySets> +</assembly> + http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/assembly/openejb-standalone/src/main/assembly/unix.xml ---------------------------------------------------------------------- diff --git a/assembly/openejb-standalone/src/main/assembly/unix.xml b/assembly/openejb-standalone/src/main/assembly/unix.xml index 8830f5a..77ab54c 100644 --- a/assembly/openejb-standalone/src/main/assembly/unix.xml +++ b/assembly/openejb-standalone/src/main/assembly/unix.xml @@ -1,124 +1,124 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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: 1482826 $ $Date: 2013-05-15 15:31:58 +0200 (Wed, 15 May 2013) $ --> - -<assembly> - <id>bin-unix</id> - <formats> - <format>tar.gz</format> - </formats> - <fileSets> - <fileSet> - <lineEnding>unix</lineEnding> - <directory>${basedir}/target/classes</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>README.txt</include> - <include>NOTICE</include> - <include>LICENSE</include> - </includes> - </fileSet> - <fileSet> - <directory>${basedir}/target/classes</directory> - <outputDirectory>bin/</outputDirectory> - <includes> - <include>*.bat</include> - <include>service.readme.txt</include> - </includes> - <lineEnding>dos</lineEnding> - <fileMode>0755</fileMode> - </fileSet> - <fileSet> - <directory>${basedir}/target/classes</directory> - <outputDirectory>bin/</outputDirectory> - <includes> - <include>openejb</include> - </includes> - <lineEnding>unix</lineEnding> - <fileMode>0755</fileMode> - </fileSet> - <fileSet> - <directory>${basedir}/src/main/resources</directory> - <outputDirectory>bin/</outputDirectory> - <includes> - <include>*.exe</include> - </includes> - </fileSet> - <fileSet> - <lineEnding>unix</lineEnding> - <directory>${basedir}/src/main/conf</directory> - <includes> - <include>README.txt</include> - <include>logging.properties</include> - <include>system.properties</include> - </includes> - <outputDirectory>conf/</outputDirectory> - </fileSet> - <fileSet> - <lineEnding>unix</lineEnding> - <outputDirectory>logs/</outputDirectory> - <directory>${project.basedir}/src/main/assembly</directory> - <excludes> - <exclude>component.xml</exclude> - <exclude>dos.xml</exclude> - <exclude>unix.xml</exclude> - </excludes> - </fileSet> - <fileSet> - <lineEnding>unix</lineEnding> - <outputDirectory>apps/</outputDirectory> - <directory>${project.basedir}/src/main/assembly</directory> - <excludes> - <exclude>component.xml</exclude> - <exclude>dos.xml</exclude> - <exclude>unix.xml</exclude> - </excludes> - </fileSet> - <fileSet> - <outputDirectory>data/</outputDirectory> - <directory>${project.basedir}/src/main/assembly</directory> - <excludes> - <exclude>component.xml</exclude> - <exclude>dos.xml</exclude> - <exclude>unix.xml</exclude> - </excludes> - </fileSet> - </fileSets> - <files> - <file> - <lineEnding>unix</lineEnding> - <source>${basedir}/target/classes/DATA-README.txt</source> - <outputDirectory>data/</outputDirectory> - <destName>README.txt</destName> - <fileMode>0755</fileMode> - </file> - </files> - <dependencySets> - <dependencySet> - <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension} - </outputFileNameMapping> - <outputDirectory>lib</outputDirectory> - <scope>runtime</scope> - <excludes> - <exclude>junit:junit</exclude> - </excludes> - </dependencySet> - </dependencySets> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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: 1482826 $ $Date: 2013-05-15 15:31:58 +0200 (Wed, 15 May 2013) $ --> + +<assembly> + <id>bin-unix</id> + <formats> + <format>tar.gz</format> + </formats> + <fileSets> + <fileSet> + <lineEnding>unix</lineEnding> + <directory>${basedir}/target/classes</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>README.txt</include> + <include>NOTICE</include> + <include>LICENSE</include> + </includes> + </fileSet> + <fileSet> + <directory>${basedir}/target/classes</directory> + <outputDirectory>bin/</outputDirectory> + <includes> + <include>*.bat</include> + <include>service.readme.txt</include> + </includes> + <lineEnding>dos</lineEnding> + <fileMode>0755</fileMode> + </fileSet> + <fileSet> + <directory>${basedir}/target/classes</directory> + <outputDirectory>bin/</outputDirectory> + <includes> + <include>openejb</include> + </includes> + <lineEnding>unix</lineEnding> + <fileMode>0755</fileMode> + </fileSet> + <fileSet> + <directory>${basedir}/src/main/resources</directory> + <outputDirectory>bin/</outputDirectory> + <includes> + <include>*.exe</include> + </includes> + </fileSet> + <fileSet> + <lineEnding>unix</lineEnding> + <directory>${basedir}/src/main/conf</directory> + <includes> + <include>README.txt</include> + <include>logging.properties</include> + <include>system.properties</include> + </includes> + <outputDirectory>conf/</outputDirectory> + </fileSet> + <fileSet> + <lineEnding>unix</lineEnding> + <outputDirectory>logs/</outputDirectory> + <directory>${project.basedir}/src/main/assembly</directory> + <excludes> + <exclude>component.xml</exclude> + <exclude>dos.xml</exclude> + <exclude>unix.xml</exclude> + </excludes> + </fileSet> + <fileSet> + <lineEnding>unix</lineEnding> + <outputDirectory>apps/</outputDirectory> + <directory>${project.basedir}/src/main/assembly</directory> + <excludes> + <exclude>component.xml</exclude> + <exclude>dos.xml</exclude> + <exclude>unix.xml</exclude> + </excludes> + </fileSet> + <fileSet> + <outputDirectory>data/</outputDirectory> + <directory>${project.basedir}/src/main/assembly</directory> + <excludes> + <exclude>component.xml</exclude> + <exclude>dos.xml</exclude> + <exclude>unix.xml</exclude> + </excludes> + </fileSet> + </fileSets> + <files> + <file> + <lineEnding>unix</lineEnding> + <source>${basedir}/target/classes/DATA-README.txt</source> + <outputDirectory>data/</outputDirectory> + <destName>README.txt</destName> + <fileMode>0755</fileMode> + </file> + </files> + <dependencySets> + <dependencySet> + <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension} + </outputFileNameMapping> + <outputDirectory>lib</outputDirectory> + <scope>runtime</scope> + <excludes> + <exclude>junit:junit</exclude> + </excludes> + </dependencySet> + </dependencySets> </assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/assembly/openejb-standalone/src/main/resources/Start.bat ---------------------------------------------------------------------- diff --git a/assembly/openejb-standalone/src/main/resources/Start.bat b/assembly/openejb-standalone/src/main/resources/Start.bat index f8804e1..9bd7d9a 100644 --- a/assembly/openejb-standalone/src/main/resources/Start.bat +++ b/assembly/openejb-standalone/src/main/resources/Start.bat @@ -1,34 +1,34 @@ -@echo off -REM================================================ -REM Licensed to the Apache Software Foundation (ASF) under one or more -REM contributor license agreements. See the NOTICE file distributed with -REM this work for additional information regarding copyright ownership. -REM The ASF licenses this file to You under the Apache License, Version 2.0 -REM (the "License"); you may not use this file except in compliance with -REM the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. -REM _______________________________________________ -REM $Rev$ -REM================================================ - -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -if "%OS%" == "Windows_NT" ( - set "DIRNAME=%~dp0%" -) else ( - set DIRNAME=.\ -) - -pushd "%DIRNAME%" - -cd .. - +@echo off +REM================================================ +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. +REM _______________________________________________ +REM $Rev$ +REM================================================ + +@if not "%ECHO%" == "" echo %ECHO% +@if "%OS%" == "Windows_NT" setlocal + +if "%OS%" == "Windows_NT" ( + set "DIRNAME=%~dp0%" +) else ( + set DIRNAME=.\ +) + +pushd "%DIRNAME%" + +cd .. + cmd /C ".\bin\openejb.bat start" \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/assembly/openejb-standalone/src/main/resources/Stop.bat ---------------------------------------------------------------------- diff --git a/assembly/openejb-standalone/src/main/resources/Stop.bat b/assembly/openejb-standalone/src/main/resources/Stop.bat index 66cdd00..50130c2 100644 --- a/assembly/openejb-standalone/src/main/resources/Stop.bat +++ b/assembly/openejb-standalone/src/main/resources/Stop.bat @@ -1,34 +1,34 @@ -@echo off -REM================================================ -REM Licensed to the Apache Software Foundation (ASF) under one or more -REM contributor license agreements. See the NOTICE file distributed with -REM this work for additional information regarding copyright ownership. -REM The ASF licenses this file to You under the Apache License, Version 2.0 -REM (the "License"); you may not use this file except in compliance with -REM the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. -REM _______________________________________________ -REM $Rev$ -REM================================================ - -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -if "%OS%" == "Windows_NT" ( - set "DIRNAME=%~dp0%" -) else ( - set DIRNAME=.\ -) - -pushd "%DIRNAME%" - -cd .. - +@echo off +REM================================================ +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. +REM _______________________________________________ +REM $Rev$ +REM================================================ + +@if not "%ECHO%" == "" echo %ECHO% +@if "%OS%" == "Windows_NT" setlocal + +if "%OS%" == "Windows_NT" ( + set "DIRNAME=%~dp0%" +) else ( + set DIRNAME=.\ +) + +pushd "%DIRNAME%" + +cd .. + cmd /C ".\bin\openejb.bat stop" \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/assembly/openejb-standalone/src/main/resources/service.install.as.admin.bat ---------------------------------------------------------------------- diff --git a/assembly/openejb-standalone/src/main/resources/service.install.as.admin.bat b/assembly/openejb-standalone/src/main/resources/service.install.as.admin.bat index 62ec736..678ff74 100644 --- a/assembly/openejb-standalone/src/main/resources/service.install.as.admin.bat +++ b/assembly/openejb-standalone/src/main/resources/service.install.as.admin.bat @@ -1,151 +1,151 @@ -@ECHO off -CLS -setlocal -REM ================================================ -REM Licensed to the Apache Software Foundation (ASF) under one or more -REM contributor license agreements. See the NOTICE file distributed with -REM this work for additional information regarding copyright ownership. -REM The ASF licenses this file to You under the Apache License, Version 2.0 -REM (the "License"); you may not use this file except in compliance with -REM the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. -REM _______________________________________________ -REM $Rev$ -REM ================================================ - -@IF NOT "%ECHO%" == "" ECHO %ECHO% -@IF "%OS%" == "Windows_NT" setlocal - -IF "%OS%" == "Windows_NT" ( - SET "DIRNAME=%~dp0%" -) ELSE ( - SET DIRNAME=.\ -) - -pushd %DIRNAME% - -SET proc=undefined - -IF /i %PROCESSOR_ARCHITECTURE% EQU X86 SET proc="%~dp0OpenEJB.%PROCESSOR_ARCHITECTURE%.exe" -IF /i %PROCESSOR_ARCHITECTURE% EQU AMD64 SET proc="%~dp0OpenEJB.%PROCESSOR_ARCHITECTURE%.exe" -IF /i %PROCESSOR_ARCHITECTURE% EQU IA64 SET proc="%~dp0OpenEJB.%PROCESSOR_ARCHITECTURE%.exe" - -IF /i %proc% EQU undefined ( - ECHO Failed to determine OS architecture - GOTO failed -) - -SET jvm=auto -REM SET JAVA_HOME=[Full path to JDK or JRE] - -REM Prefer a local JRE or JDK if we find one in the current or parent directory -pushd.. -set dir=%cd% -popd - -IF EXIST "%dir%\jre" ( - SET JAVA_HOME="%dir%" - ECHO Found local JRE - GOTO found_java_home -) - -IF EXIST "%dir%\jdk" ( - SET JAVA_HOME="%dir%\jdk" - ECHO Found local JDK - GOTO found_java_home -) - -if not "%JAVA_HOME%" == "" GOTO found_java_home - -ECHO Environment variable JAVA_HOME is not set and no local JRE was found. -ECHO Please set JAVA_HOME to the directory of your local JDK or JRE to avoid this message. -GOTO skip_java_home - -:found_java_home - -REM Make an attempt to find either the server or client jvm.dll -IF EXIST "%JAVA_HOME%\jre\bin\server\jvm.dll" ( - SET jvm="%JAVA_HOME%\jre\bin\server\jvm.dll" -) ELSE ( - IF EXIST "%JAVA_HOME%\jre\bin\client\jvm.dll" ( - SET jvm="%JAVA_HOME%\jre\bin\client\jvm.dll" - ) ELSE ( - IF EXIST "%JAVA_HOME%\bin\server\jvm.dll" ( - SET jvm="%JAVA_HOME%\bin\server\jvm.dll" - ) ELSE ( - IF EXIST "%JAVA_HOME%\bin\client\jvm.dll" ( - SET jvm="%JAVA_HOME%\bin\client\jvm.dll" - ) ELSE ( - ECHO Cannot locate a jvm.dll - Are you sure JAVA_HOME is set correctly? - ECHO The service installer will now attempt to locate and use 'any' JVM. - ) - ) - ) -) - -:skip_java_home - -SET openejb=. -CD .. - -SET "openejb=%CD%" -SET logs=%openejb%\logs -SET lib=%openejb%\lib -SET corejar="%lib%\openejb-core-*.jar" -SET daemonjar="%lib%\openejb-daemon-*.jar" - -FOR %%a IN (%corejar%) DO ( - SET corejar="%%a" -) - -FOR %%a IN (%daemonjar%) DO ( - SET daemonjar="%%a" -) - -SET classpath="%corejar%;%daemonjar%" - -ECHO Installing service using JVM: %jvm% - -REM Allow file access to Local System -cacls "%openejb%" /E /P System:F - -REM Extensive documentation can be found here - http://commons.apache.org/daemon/procrun.html - -%proc% //IS//OpenEJBServer --DisplayName="OpenEJB Server" ^ - --Install=%proc% ^ - --Startup auto ^ - --StartPath="%openejb%" ^ - --Description="OpenEJB Server Service" ^ - --Jvm="%jvm%" ^ - --Classpath=%classpath% ^ - --StartMode=jvm ^ - --StartClass=org.apache.openejb.daemon.NTService --StartMethod=start ^ - --StopMode=jvm ^ - --JvmMs=512 ^ - --JvmMx=1024 ^ - --JvmSs=2048 ^ - --StopClass=org.apache.openejb.daemon.NTService --StopMethod=stop ^ - --LogPrefix=service ^ - --LogPath="%logs%" --StdOutput="%logs%\service.out.log" --StdError="%logs%\service.err.log" --PidFile=service.pid ^ - --LogLevel=Info ^ - --LibraryPath="%openejb%\bin" ^ - ++JvmOptions=-Dopenejb.home="%openejb%";-XX:MaxPermSize=256M - REM ++DependsOn=AnotherServiceName - REM Add ^ symbol to end of ++JvmOptions line if ++DependsOn is uncommented - -NET START OpenEJBServer - -GOTO complete - -:failed - -ECHO Failed to install service - +@ECHO off +CLS +setlocal +REM ================================================ +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. +REM _______________________________________________ +REM $Rev$ +REM ================================================ + +@IF NOT "%ECHO%" == "" ECHO %ECHO% +@IF "%OS%" == "Windows_NT" setlocal + +IF "%OS%" == "Windows_NT" ( + SET "DIRNAME=%~dp0%" +) ELSE ( + SET DIRNAME=.\ +) + +pushd %DIRNAME% + +SET proc=undefined + +IF /i %PROCESSOR_ARCHITECTURE% EQU X86 SET proc="%~dp0OpenEJB.%PROCESSOR_ARCHITECTURE%.exe" +IF /i %PROCESSOR_ARCHITECTURE% EQU AMD64 SET proc="%~dp0OpenEJB.%PROCESSOR_ARCHITECTURE%.exe" +IF /i %PROCESSOR_ARCHITECTURE% EQU IA64 SET proc="%~dp0OpenEJB.%PROCESSOR_ARCHITECTURE%.exe" + +IF /i %proc% EQU undefined ( + ECHO Failed to determine OS architecture + GOTO failed +) + +SET jvm=auto +REM SET JAVA_HOME=[Full path to JDK or JRE] + +REM Prefer a local JRE or JDK if we find one in the current or parent directory +pushd.. +set dir=%cd% +popd + +IF EXIST "%dir%\jre" ( + SET JAVA_HOME="%dir%" + ECHO Found local JRE + GOTO found_java_home +) + +IF EXIST "%dir%\jdk" ( + SET JAVA_HOME="%dir%\jdk" + ECHO Found local JDK + GOTO found_java_home +) + +if not "%JAVA_HOME%" == "" GOTO found_java_home + +ECHO Environment variable JAVA_HOME is not set and no local JRE was found. +ECHO Please set JAVA_HOME to the directory of your local JDK or JRE to avoid this message. +GOTO skip_java_home + +:found_java_home + +REM Make an attempt to find either the server or client jvm.dll +IF EXIST "%JAVA_HOME%\jre\bin\server\jvm.dll" ( + SET jvm="%JAVA_HOME%\jre\bin\server\jvm.dll" +) ELSE ( + IF EXIST "%JAVA_HOME%\jre\bin\client\jvm.dll" ( + SET jvm="%JAVA_HOME%\jre\bin\client\jvm.dll" + ) ELSE ( + IF EXIST "%JAVA_HOME%\bin\server\jvm.dll" ( + SET jvm="%JAVA_HOME%\bin\server\jvm.dll" + ) ELSE ( + IF EXIST "%JAVA_HOME%\bin\client\jvm.dll" ( + SET jvm="%JAVA_HOME%\bin\client\jvm.dll" + ) ELSE ( + ECHO Cannot locate a jvm.dll - Are you sure JAVA_HOME is set correctly? + ECHO The service installer will now attempt to locate and use 'any' JVM. + ) + ) + ) +) + +:skip_java_home + +SET openejb=. +CD .. + +SET "openejb=%CD%" +SET logs=%openejb%\logs +SET lib=%openejb%\lib +SET corejar="%lib%\openejb-core-*.jar" +SET daemonjar="%lib%\openejb-daemon-*.jar" + +FOR %%a IN (%corejar%) DO ( + SET corejar="%%a" +) + +FOR %%a IN (%daemonjar%) DO ( + SET daemonjar="%%a" +) + +SET classpath="%corejar%;%daemonjar%" + +ECHO Installing service using JVM: %jvm% + +REM Allow file access to Local System +cacls "%openejb%" /E /P System:F + +REM Extensive documentation can be found here - http://commons.apache.org/daemon/procrun.html + +%proc% //IS//OpenEJBServer --DisplayName="OpenEJB Server" ^ + --Install=%proc% ^ + --Startup auto ^ + --StartPath="%openejb%" ^ + --Description="OpenEJB Server Service" ^ + --Jvm="%jvm%" ^ + --Classpath=%classpath% ^ + --StartMode=jvm ^ + --StartClass=org.apache.openejb.daemon.NTService --StartMethod=start ^ + --StopMode=jvm ^ + --JvmMs=512 ^ + --JvmMx=1024 ^ + --JvmSs=2048 ^ + --StopClass=org.apache.openejb.daemon.NTService --StopMethod=stop ^ + --LogPrefix=service ^ + --LogPath="%logs%" --StdOutput="%logs%\service.out.log" --StdError="%logs%\service.err.log" --PidFile=service.pid ^ + --LogLevel=Info ^ + --LibraryPath="%openejb%\bin" ^ + ++JvmOptions=-Dopenejb.home="%openejb%";-XX:MaxPermSize=256M + REM ++DependsOn=AnotherServiceName + REM Add ^ symbol to end of ++JvmOptions line if ++DependsOn is uncommented + +NET START OpenEJBServer + +GOTO complete + +:failed + +ECHO Failed to install service + :complete \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/fa0d3745/assembly/openejb-standalone/src/main/resources/service.remove.as.admin.bat ---------------------------------------------------------------------- diff --git a/assembly/openejb-standalone/src/main/resources/service.remove.as.admin.bat b/assembly/openejb-standalone/src/main/resources/service.remove.as.admin.bat index d3f2fdd..b7794fc 100644 --- a/assembly/openejb-standalone/src/main/resources/service.remove.as.admin.bat +++ b/assembly/openejb-standalone/src/main/resources/service.remove.as.admin.bat @@ -1,49 +1,49 @@ -@echo off -cls -REM================================================ -REM Licensed to the Apache Software Foundation (ASF) under one or more -REM contributor license agreements. See the NOTICE file distributed with -REM this work for additional information regarding copyright ownership. -REM The ASF licenses this file to You under the Apache License, Version 2.0 -REM (the "License"); you may not use this file except in compliance with -REM the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. -REM _______________________________________________ -REM $Rev$ -REM================================================ - -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -if "%OS%" == "Windows_NT" ( - set "DIRNAME=%~dp0%" -) else ( - set DIRNAME=.\ -) - -pushd %DIRNAME% - -SET proc=undefined - -if /i %PROCESSOR_ARCHITECTURE% EQU X86 SET proc="%~dp0OpenEJB.%PROCESSOR_ARCHITECTURE%.exe" -if /i %PROCESSOR_ARCHITECTURE% EQU AMD64 SET proc="%~dp0OpenEJB.%PROCESSOR_ARCHITECTURE%.exe" -if /i %PROCESSOR_ARCHITECTURE% EQU IA64 SET proc=%~dp0OpenEJB.%PROCESSOR_ARCHITECTURE%.exe" - -if /i %proc% EQU undefined GOTO failed - -%proc% //DS//OpenEJBServer - -GOTO complete - -:failed - -ECHO Failed to determine OS architecture - +@echo off +cls +REM================================================ +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. +REM _______________________________________________ +REM $Rev$ +REM================================================ + +@if not "%ECHO%" == "" echo %ECHO% +@if "%OS%" == "Windows_NT" setlocal + +if "%OS%" == "Windows_NT" ( + set "DIRNAME=%~dp0%" +) else ( + set DIRNAME=.\ +) + +pushd %DIRNAME% + +SET proc=undefined + +if /i %PROCESSOR_ARCHITECTURE% EQU X86 SET proc="%~dp0OpenEJB.%PROCESSOR_ARCHITECTURE%.exe" +if /i %PROCESSOR_ARCHITECTURE% EQU AMD64 SET proc="%~dp0OpenEJB.%PROCESSOR_ARCHITECTURE%.exe" +if /i %PROCESSOR_ARCHITECTURE% EQU IA64 SET proc=%~dp0OpenEJB.%PROCESSOR_ARCHITECTURE%.exe" + +if /i %proc% EQU undefined GOTO failed + +%proc% //DS//OpenEJBServer + +GOTO complete + +:failed + +ECHO Failed to determine OS architecture + :complete \ No newline at end of file
