Repository: tomee Updated Branches: refs/heads/tomee-1.7.3-prepare 37ef9f61d -> 124eb43b8
http://git-wip-us.apache.org/repos/asf/tomee/blob/e9dbbab4/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/InternalApplication.java ---------------------------------------------------------------------- diff --git a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/InternalApplication.java b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/InternalApplication.java index 2035805..cb36fda 100644 --- a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/InternalApplication.java +++ b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/InternalApplication.java @@ -1,45 +1,45 @@ -/* - * 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.rest; - -import javax.ws.rs.core.Application; -import java.util.HashSet; -import java.util.Set; - -public class InternalApplication extends Application { - private final Set<Class<?>> classes = new HashSet<Class<?>>(); - private final Set<Object> singletons = new HashSet<Object>(); - private final Application original; - - public InternalApplication(final Application original) { - this.original = original; - } - - @Override - public Set<Class<?>> getClasses() { - return classes; - } - - @Override - public Set<Object> getSingletons() { - return singletons; - } - - public Application getOriginal() { - return original; - } -} +/* + * 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.rest; + +import javax.ws.rs.core.Application; +import java.util.HashSet; +import java.util.Set; + +public class InternalApplication extends Application { + private final Set<Class<?>> classes = new HashSet<Class<?>>(); + private final Set<Object> singletons = new HashSet<Object>(); + private final Application original; + + public InternalApplication(final Application original) { + this.original = original; + } + + @Override + public Set<Class<?>> getClasses() { + return classes; + } + + @Override + public Set<Object> getSingletons() { + return singletons; + } + + public Application getOriginal() { + return original; + } +} http://git-wip-us.apache.org/repos/asf/tomee/blob/e9dbbab4/server/openejb-server/src/main/resources/META-INF/openejb-server.xml ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/resources/META-INF/openejb-server.xml b/server/openejb-server/src/main/resources/META-INF/openejb-server.xml index 42cd306..05473d9 100644 --- a/server/openejb-server/src/main/resources/META-INF/openejb-server.xml +++ b/server/openejb-server/src/main/resources/META-INF/openejb-server.xml @@ -1,36 +1,36 @@ -<?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$ $Date$ --> - -<beans xmlns:s="http://tomee.apache.org/schemas/server"; xmlns:c="http://tomee.apache.org/schemas/core"; - xmlns:l="http://tomee.apache.org/schemas/loader";> - <s:server id="server" init-method="init"> - <property name="serviceManager" ref="serviceManager" /> - <property name="propertiesService" ref="propertiesService" /> - </s:server> - <c:propertiesService id="propertiesService" /> - <bean id="serviceManager" class="org.apache.openejb.server.ServiceManager" factory-method="getManager" /> - <!-- - - FIXME: The only singleton class with lots of static code - really hard to get it XBean-ized properly - - - <l:system factory-method="get" init-method="init" /> - --> -</beans> +<?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$ $Date$ --> + +<beans xmlns:s="http://tomee.apache.org/schemas/server"; xmlns:c="http://tomee.apache.org/schemas/core"; + xmlns:l="http://tomee.apache.org/schemas/loader";> + <s:server id="server" init-method="init"> + <property name="serviceManager" ref="serviceManager" /> + <property name="propertiesService" ref="propertiesService" /> + </s:server> + <c:propertiesService id="propertiesService" /> + <bean id="serviceManager" class="org.apache.openejb.server.ServiceManager" factory-method="getManager" /> + <!-- + - FIXME: The only singleton class with lots of static code - really hard to get it XBean-ized properly + - + <l:system factory-method="get" init-method="init" /> + --> +</beans> http://git-wip-us.apache.org/repos/asf/tomee/blob/e9dbbab4/server/openejb-server/src/main/resources/META-INF/org.apache.openejb.cli/stop.help ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/resources/META-INF/org.apache.openejb.cli/stop.help b/server/openejb-server/src/main/resources/META-INF/org.apache.openejb.cli/stop.help index 9632aa8..ce00fe0 100644 --- a/server/openejb-server/src/main/resources/META-INF/org.apache.openejb.cli/stop.help +++ b/server/openejb-server/src/main/resources/META-INF/org.apache.openejb.cli/stop.help @@ -1,15 +1,15 @@ -Usage: openejb stop [options] - -Stops the OpenEJB Server running on host 127.0.0.1 and port 4201 - -OPTIONS - -h host Stops the server at the specified host address - Default host is 127.0.0.1 - -p port Stops the server running on the specified port. - Default port is 4201. - -OpenEJB -- EJB Container System and EJB Server. -For OpenEJB updates and additional information, visit -http://tomee.apache.org - +Usage: openejb stop [options] + +Stops the OpenEJB Server running on host 127.0.0.1 and port 4201 + +OPTIONS + -h host Stops the server at the specified host address + Default host is 127.0.0.1 + -p port Stops the server running on the specified port. + Default port is 4201. + +OpenEJB -- EJB Container System and EJB Server. +For OpenEJB updates and additional information, visit +http://tomee.apache.org + Bug Reports to <[email protected]> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/e9dbbab4/src/main/style/checkstyle.xml ---------------------------------------------------------------------- diff --git a/src/main/style/checkstyle.xml b/src/main/style/checkstyle.xml index 4cc9921..a1524f1 100644 --- a/src/main/style/checkstyle.xml +++ b/src/main/style/checkstyle.xml @@ -1,165 +1,165 @@ -<?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. ---> -<!DOCTYPE module PUBLIC - "-//Puppy Crawl//DTD Check Configuration 1.2//EN" - "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";> -<module name="Checker"> - <!-- - If you set the basedir property below, then all reported file - names will be relative to the specified directory. See - http://checkstyle.sourceforge.net/5.x/config.html#Checker - - <property name="basedir" value="${basedir}"/> - --> - - <!-- Checks that property files contain the same keys. --> - <!-- See http://checkstyle.sf.net/config_misc.html#Translation --> - <!--<module name="Translation"/>--> - - <!--<module name="FileLength"/>--> - - <!-- Following interprets the header file as regular expressions. --> - <!-- <module name="RegexpHeader"/> --> - - <module name="SuppressWarningsFilter" /> - - <module name="FileTabCharacter"> - <property name="eachLine" value="true"/> - </module> - - <!--<module name="RegexpSingleline">--> - <!--<!– \s matches whitespace character, $ matches end of line. –>--> - <!--<property name="format" value="\s+$"/>--> - <!--<property name="message" value="Line has trailing spaces."/>--> - <!--</module>--> - - <!-- Checks for Headers --> - <!-- See http://checkstyle.sf.net/config_header.html --> - <!--<module name="Header">--> - <!--<property name="headerFile" value="${checkstyle.header.file}"/>--> - <!--<property name="fileExtensions" value="java"/>--> - <!--</module>--> - - <module name="TreeWalker"> - <module name="SuppressWarningsHolder" /> - - <property name="cacheFile" value="${checkstyle.cache.file}"/> - - <!-- Checks for Javadoc comments. --> - <!-- See http://checkstyle.sf.net/config_javadoc.html --> - <!--<module name="JavadocMethod"/>--> - <!--<module name="JavadocType"/>--> - <!--<module name="JavadocVariable"/>--> - <!--<module name="JavadocStyle"/>--> - - - <!-- Checks for Naming Conventions. --> - <!-- See http://checkstyle.sf.net/config_naming.html --> - <!--<module name="ConstantName"/>--> - <module name="LocalFinalVariableName"/> - <module name="LocalVariableName"/> - <module name="MemberName"/> - <!--<module name="MethodName"/>--> - <module name="PackageName"/> - <module name="ParameterName"/> - <!--<module name="StaticVariableName"/>--> - <!--<module name="TypeName"/>--> - - - <!-- Checks for imports --> - <!-- See http://checkstyle.sf.net/config_import.html --> - <module name="IllegalImport"/> - <!-- defaults to sun.* packages --> - <module name="RedundantImport"/> - <module name="UnusedImports"> - <property name="processJavadoc" value="true" /> - </module> - - - <!-- Checks for Size Violations. --> - <!-- See http://checkstyle.sf.net/config_sizes.html --> - <!--<module name="LineLength">--> - <!--<property name="max" value="120"/>--> - <!--</module>--> - <!--<module name="MethodLength"/>--> - <!--<module name="ParameterNumber"/>--> - - - <!-- Checks for whitespace --> - <!-- See http://checkstyle.sf.net/config_whitespace.html --> - <!--<module name="EmptyForIteratorPad"/>--> - <!--<module name="MethodParamPad"/>--> - <!--<module name="NoWhitespaceAfter"/>--> - <!--<module name="NoWhitespaceBefore"/>--> - <!--<module name="OperatorWrap"/>--> - <!--<module name="ParenPad"/>--> - <!--<module name="TypecastParenPad"/>--> - <!--<module name="WhitespaceAfter"/>--> - - <!-- Modifier Checks --> - <!-- See http://checkstyle.sf.net/config_modifiers.html --> - <module name="ModifierOrder"/> - <module name="RedundantModifier"/> - - - <!-- Checks for blocks. You know, those {}'s --> - <!-- See http://checkstyle.sf.net/config_blocks.html --> - <!--<module name="AvoidNestedBlocks"/>--> - <!--<module name="LeftCurly"/>--> - <module name="NeedBraces"/> - <!--<module name="RightCurly"/>--> - - - <!-- Checks for common coding problems --> - <!-- See http://checkstyle.sf.net/config_coding.html --> - <!--<module name="EmptyStatement"/>--> - <!--<module name="EqualsHashCode"/>--> - <!--<module name="HiddenField">--> - <!--<property name="ignoreSetter" value="true"/>--> - <!--</module>--> - <module name="IllegalInstantiation"/> - <!--<module name="InnerAssignment"/>--> - <!--<module name="MagicNumber">--> - <!--<property name="ignoreHashCodeMethod" value="true"/>--> - <!--</module>--> - <!--<module name="MissingSwitchDefault"/>--> - <!--<module name="RedundantThrows"/>--> - <module name="SimplifyBooleanExpression"/> - <module name="SimplifyBooleanReturn"/> - - <!-- Checks for class design --> - <!-- See http://checkstyle.sf.net/config_design.html --> - <module name="FinalClass"/> - <!--<module name="HideUtilityClassConstructor"/>--> - <!--<module name="InterfaceIsType"/>--> - <!--<module name="VisibilityModifier">--> - <!--<property name="packageAllowed" value="true"/>--> - <!--<property name="protectedAllowed" value="true"/>--> - <!--</module>--> - - <!-- Miscellaneous other checks. --> - <!-- See http://checkstyle.sf.net/config_misc.html --> - <module name="ArrayTypeStyle"/> - <!--<module name="TodoComment"/>--> - <!--<module name="UpperEll"/>--> - - </module> - -</module> +<?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. +--> +<!DOCTYPE module PUBLIC + "-//Puppy Crawl//DTD Check Configuration 1.2//EN" + "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";> +<module name="Checker"> + <!-- + If you set the basedir property below, then all reported file + names will be relative to the specified directory. See + http://checkstyle.sourceforge.net/5.x/config.html#Checker + + <property name="basedir" value="${basedir}"/> + --> + + <!-- Checks that property files contain the same keys. --> + <!-- See http://checkstyle.sf.net/config_misc.html#Translation --> + <!--<module name="Translation"/>--> + + <!--<module name="FileLength"/>--> + + <!-- Following interprets the header file as regular expressions. --> + <!-- <module name="RegexpHeader"/> --> + + <module name="SuppressWarningsFilter" /> + + <module name="FileTabCharacter"> + <property name="eachLine" value="true"/> + </module> + + <!--<module name="RegexpSingleline">--> + <!--<!– \s matches whitespace character, $ matches end of line. –>--> + <!--<property name="format" value="\s+$"/>--> + <!--<property name="message" value="Line has trailing spaces."/>--> + <!--</module>--> + + <!-- Checks for Headers --> + <!-- See http://checkstyle.sf.net/config_header.html --> + <!--<module name="Header">--> + <!--<property name="headerFile" value="${checkstyle.header.file}"/>--> + <!--<property name="fileExtensions" value="java"/>--> + <!--</module>--> + + <module name="TreeWalker"> + <module name="SuppressWarningsHolder" /> + + <property name="cacheFile" value="${checkstyle.cache.file}"/> + + <!-- Checks for Javadoc comments. --> + <!-- See http://checkstyle.sf.net/config_javadoc.html --> + <!--<module name="JavadocMethod"/>--> + <!--<module name="JavadocType"/>--> + <!--<module name="JavadocVariable"/>--> + <!--<module name="JavadocStyle"/>--> + + + <!-- Checks for Naming Conventions. --> + <!-- See http://checkstyle.sf.net/config_naming.html --> + <!--<module name="ConstantName"/>--> + <module name="LocalFinalVariableName"/> + <module name="LocalVariableName"/> + <module name="MemberName"/> + <!--<module name="MethodName"/>--> + <module name="PackageName"/> + <module name="ParameterName"/> + <!--<module name="StaticVariableName"/>--> + <!--<module name="TypeName"/>--> + + + <!-- Checks for imports --> + <!-- See http://checkstyle.sf.net/config_import.html --> + <module name="IllegalImport"/> + <!-- defaults to sun.* packages --> + <module name="RedundantImport"/> + <module name="UnusedImports"> + <property name="processJavadoc" value="true" /> + </module> + + + <!-- Checks for Size Violations. --> + <!-- See http://checkstyle.sf.net/config_sizes.html --> + <!--<module name="LineLength">--> + <!--<property name="max" value="120"/>--> + <!--</module>--> + <!--<module name="MethodLength"/>--> + <!--<module name="ParameterNumber"/>--> + + + <!-- Checks for whitespace --> + <!-- See http://checkstyle.sf.net/config_whitespace.html --> + <!--<module name="EmptyForIteratorPad"/>--> + <!--<module name="MethodParamPad"/>--> + <!--<module name="NoWhitespaceAfter"/>--> + <!--<module name="NoWhitespaceBefore"/>--> + <!--<module name="OperatorWrap"/>--> + <!--<module name="ParenPad"/>--> + <!--<module name="TypecastParenPad"/>--> + <!--<module name="WhitespaceAfter"/>--> + + <!-- Modifier Checks --> + <!-- See http://checkstyle.sf.net/config_modifiers.html --> + <module name="ModifierOrder"/> + <module name="RedundantModifier"/> + + + <!-- Checks for blocks. You know, those {}'s --> + <!-- See http://checkstyle.sf.net/config_blocks.html --> + <!--<module name="AvoidNestedBlocks"/>--> + <!--<module name="LeftCurly"/>--> + <module name="NeedBraces"/> + <!--<module name="RightCurly"/>--> + + + <!-- Checks for common coding problems --> + <!-- See http://checkstyle.sf.net/config_coding.html --> + <!--<module name="EmptyStatement"/>--> + <!--<module name="EqualsHashCode"/>--> + <!--<module name="HiddenField">--> + <!--<property name="ignoreSetter" value="true"/>--> + <!--</module>--> + <module name="IllegalInstantiation"/> + <!--<module name="InnerAssignment"/>--> + <!--<module name="MagicNumber">--> + <!--<property name="ignoreHashCodeMethod" value="true"/>--> + <!--</module>--> + <!--<module name="MissingSwitchDefault"/>--> + <!--<module name="RedundantThrows"/>--> + <module name="SimplifyBooleanExpression"/> + <module name="SimplifyBooleanReturn"/> + + <!-- Checks for class design --> + <!-- See http://checkstyle.sf.net/config_design.html --> + <module name="FinalClass"/> + <!--<module name="HideUtilityClassConstructor"/>--> + <!--<module name="InterfaceIsType"/>--> + <!--<module name="VisibilityModifier">--> + <!--<property name="packageAllowed" value="true"/>--> + <!--<property name="protectedAllowed" value="true"/>--> + <!--</module>--> + + <!-- Miscellaneous other checks. --> + <!-- See http://checkstyle.sf.net/config_misc.html --> + <module name="ArrayTypeStyle"/> + <!--<module name="TodoComment"/>--> + <!--<module name="UpperEll"/>--> + + </module> + +</module> http://git-wip-us.apache.org/repos/asf/tomee/blob/e9dbbab4/tck/tck-common/src/main/java/org/apache/openejb/tck/util/ServerLocal.java ---------------------------------------------------------------------- diff --git a/tck/tck-common/src/main/java/org/apache/openejb/tck/util/ServerLocal.java b/tck/tck-common/src/main/java/org/apache/openejb/tck/util/ServerLocal.java index 856c429..422b12b 100644 --- a/tck/tck-common/src/main/java/org/apache/openejb/tck/util/ServerLocal.java +++ b/tck/tck-common/src/main/java/org/apache/openejb/tck/util/ServerLocal.java @@ -1,50 +1,50 @@ -/* - * 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.tck.util; - -import org.apache.tomee.util.QuickServerXmlParser; - -import java.io.File; - -public class ServerLocal { - - private ServerLocal() { - } - - /** - * If the TCK is running against a local server extracted to the target dir - * then the server.xml will have the port defined already. - * - * @param def Default port to use if none is found - * @return The determined port, the value of 'server.http.port' or the provided default - */ - public static int getPort(final int def) { - final String home = System.getProperty("openejb.home", "empty"); - - if (!"empty".equals(home)) { - final File serverXml = new File(home, "conf/server.xml"); - - if (serverXml.exists() && serverXml.isFile()) { - final QuickServerXmlParser parser = QuickServerXmlParser.parse(serverXml); - - return Integer.parseInt(parser.http()); - } - } - - return Integer.getInteger("server.http.port", def); - } -} +/* + * 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.tck.util; + +import org.apache.tomee.util.QuickServerXmlParser; + +import java.io.File; + +public class ServerLocal { + + private ServerLocal() { + } + + /** + * If the TCK is running against a local server extracted to the target dir + * then the server.xml will have the port defined already. + * + * @param def Default port to use if none is found + * @return The determined port, the value of 'server.http.port' or the provided default + */ + public static int getPort(final int def) { + final String home = System.getProperty("openejb.home", "empty"); + + if (!"empty".equals(home)) { + final File serverXml = new File(home, "conf/server.xml"); + + if (serverXml.exists() && serverXml.isFile()) { + final QuickServerXmlParser parser = QuickServerXmlParser.parse(serverXml); + + return Integer.parseInt(parser.http()); + } + } + + return Integer.getInteger("server.http.port", def); + } +} http://git-wip-us.apache.org/repos/asf/tomee/blob/e9dbbab4/tomee/apache-tomee/src/main/resources/service.install.as.admin.bat ---------------------------------------------------------------------- diff --git a/tomee/apache-tomee/src/main/resources/service.install.as.admin.bat b/tomee/apache-tomee/src/main/resources/service.install.as.admin.bat index 8569a4d..dcfbe6b 100644 --- a/tomee/apache-tomee/src/main/resources/service.install.as.admin.bat +++ b/tomee/apache-tomee/src/main/resources/service.install.as.admin.bat @@ -1,33 +1,33 @@ -@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% - +@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% + service install \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/e9dbbab4/tomee/apache-tomee/src/main/resources/service.remove.as.admin.bat ---------------------------------------------------------------------- diff --git a/tomee/apache-tomee/src/main/resources/service.remove.as.admin.bat b/tomee/apache-tomee/src/main/resources/service.remove.as.admin.bat index 3b5d4ac..bc5fe0a 100644 --- a/tomee/apache-tomee/src/main/resources/service.remove.as.admin.bat +++ b/tomee/apache-tomee/src/main/resources/service.remove.as.admin.bat @@ -1,33 +1,33 @@ -@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% - +@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% + service remove \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/e9dbbab4/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatDeploymentLoader.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatDeploymentLoader.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatDeploymentLoader.java index 03fea68..4496e54 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatDeploymentLoader.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatDeploymentLoader.java @@ -1,43 +1,43 @@ -/* - * 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.tomee.catalina; - -import org.apache.catalina.core.StandardContext; -import org.apache.openejb.config.DeploymentLoader; - -/** - * @version $Id$ - */ -public class TomcatDeploymentLoader extends DeploymentLoader { - private StandardContext standardContext; - private String moduleId; - - public TomcatDeploymentLoader(final StandardContext standardContext, final String moduleId) { - this.standardContext = standardContext; - this.moduleId = moduleId; - } - - @Override - protected String getContextRoot() { - return standardContext.getPath(); - } - - @Override - protected String getModuleName() { - return moduleId; - } -} +/* + * 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.tomee.catalina; + +import org.apache.catalina.core.StandardContext; +import org.apache.openejb.config.DeploymentLoader; + +/** + * @version $Id$ + */ +public class TomcatDeploymentLoader extends DeploymentLoader { + private StandardContext standardContext; + private String moduleId; + + public TomcatDeploymentLoader(final StandardContext standardContext, final String moduleId) { + this.standardContext = standardContext; + this.moduleId = moduleId; + } + + @Override + protected String getContextRoot() { + return standardContext.getPath(); + } + + @Override + protected String getModuleName() { + return moduleId; + } +}
