You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/04/14 13:01:47 UTC

svn commit: r1587181 - in /tomee/tomee/branches/tomee-1.6.0.1: assembly/openejb-standalone/src/main/resources/ container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ container/openejb-core/src/main/...

Author: andygumbrecht
Date: Mon Apr 14 11:01:47 2014
New Revision: 1587181

URL: http://svn.apache.org/r1587181
Log:
Fix headers.
Include Apache Tomcat Native library 1.1.30 - Users still need to update their OS OpenSSL
Added Win service monitor.

Added:
    tomee/tomee/branches/tomee-1.6.0.1/assembly/openejb-standalone/src/main/resources/OpenEJBServer.exe   (with props)
    tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/TomEE.exe   (with props)
    tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/tomcat-native.tar.gz   (with props)
Modified:
    tomee/tomee/branches/tomee-1.6.0.1/assembly/openejb-standalone/src/main/resources/openejb
    tomee/tomee/branches/tomee-1.6.0.1/assembly/openejb-standalone/src/main/resources/service.readme.txt
    tomee/tomee/branches/tomee-1.6.0.1/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedThreadFactoryImplFactory.java
    tomee/tomee/branches/tomee-1.6.0.1/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/xa/CommonDataSourceAdapter.java
    tomee/tomee/branches/tomee-1.6.0.1/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java
    tomee/tomee/branches/tomee-1.6.0.1/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/HessianRegistryImpl.java
    tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/service.bat
    tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/service.readme.txt
    tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-common/src/main/java/org/apache/tomee/installer/InstallerTools.java
    tomee/tomee/branches/tomee-1.6.0.1/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockRegistry.java

Added: tomee/tomee/branches/tomee-1.6.0.1/assembly/openejb-standalone/src/main/resources/OpenEJBServer.exe
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/assembly/openejb-standalone/src/main/resources/OpenEJBServer.exe?rev=1587181&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomee/tomee/branches/tomee-1.6.0.1/assembly/openejb-standalone/src/main/resources/OpenEJBServer.exe
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: tomee/tomee/branches/tomee-1.6.0.1/assembly/openejb-standalone/src/main/resources/openejb
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/assembly/openejb-standalone/src/main/resources/openejb?rev=1587181&r1=1587180&r2=1587181&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/assembly/openejb-standalone/src/main/resources/openejb (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/assembly/openejb-standalone/src/main/resources/openejb Mon Apr 14 11:01:47 2014
@@ -51,7 +51,7 @@ if [ -z "$OPENEJB_HOME" -o ! -d "$OPENEJ
   progname=`basename "$0"`
 
   # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
+  while [ -L "$PRG" ] ; do
     ls=`ls -ld "$PRG"`
     link=`expr "$ls" : '.*-> \(.*\)$'`
     if expr "$link" : '/.*' > /dev/null; then
@@ -74,15 +74,15 @@ fi
 
 #echo OPENEJB_HOME = $OPENEJB_HOME
 
-OPTIONS="-Dopenejb.home=$OPENEJB_HOME"
-
-OPENEJB_CORE_JAR="$OPENEJB_HOME/lib/openejb-core-${version}.jar:$OPENEJB_HOME/lib/$(ls $OPENEJB_HOME/lib | grep javaee-api)"
+OPENEJB_CORE_JAR="$OPENEJB_HOME/lib/openejb-core-${version}.jar"
+OPENEJB_JAVAEE_JAR=$(echo "$OPENEJB_HOME"/lib/javaee-api*)
+OPENEJB_CP="$OPENEJB_CORE_JAR:$OPENEJB_JAVAEE_JAR"
 OPENEJB_JAVAAGENT_JAR="$OPENEJB_HOME/lib/openejb-javaagent-${version}.jar"
 
 args="$@"
-if [ "x$@" = "xdebug" ]; then
-    OPENEJB_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
-    args="start"
+if [ "$1" = "debug" ]; then
+    OPENEJB_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 $OPENEJB_OPTS"
+	args="start"
 fi
 
-java $OPENEJB_OPTS  "-Djava.util.logging.config.file=$OPENEJB_HOME/conf/logging.properties" "-javaagent:$OPENEJB_JAVAAGENT_JAR" -cp "$OPENEJB_CORE_JAR"  org.apache.openejb.cli.Bootstrap "$args"
+java $OPENEJB_OPTS  "-Djava.util.logging.config.file=$OPENEJB_HOME/conf/logging.properties" "-javaagent:$OPENEJB_JAVAAGENT_JAR" -cp "$OPENEJB_CP"  org.apache.openejb.cli.Bootstrap $args

Modified: tomee/tomee/branches/tomee-1.6.0.1/assembly/openejb-standalone/src/main/resources/service.readme.txt
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/assembly/openejb-standalone/src/main/resources/service.readme.txt?rev=1587181&r1=1587180&r2=1587181&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/assembly/openejb-standalone/src/main/resources/service.readme.txt (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/assembly/openejb-standalone/src/main/resources/service.readme.txt Mon Apr 14 11:01:47 2014
@@ -1 +1 @@
-Windows NT Service
==================

The two batch files for creating and removing OpenEJB as a Windows Service are basically
self explanatory. Both scripts must be run using an account that has rights to install
or de-install a service. This is usually an administrator account.

service.install.as.admin.bat
service.remove.as.admin.bat

If a 'jre' or 'jdk' directory is found in an adjacent path to this 'bin' directory then
this will be used as the preferred runtime, else the installed system runtime is used.

NOTE: If you modify either of these batch files then ensure that there are no hidden
characters after the '^' continuation symbol (such as tab or space). But always ensure
there is a space before (and not a tab). The service installer will drop further options
and simply warn that '++JvmOptions' is unknown, leading to unexpected results.

++JvmOptions=-Dopenejb.home="%openejb%" ^
++JvmOptions=-Xms128M ^[tab or space] <-- Will break here, no further options will be appended
++JvmOptions=-Xmx512M ^
++JvmOptions=-XX:MaxPermSize=256M <-- Last line has no continuation symbol
\ No newline at end of file
+Windows NT Service
==================

The two batch files for creating and removing OpenEJB as a Windows Service are basically
self explanatory. Both scripts must be run using an account that has rights to install
or de-install a service. This is usually an administrator account.

service.install.as.admin.bat
service.remove.as.admin.bat

If a 'jre' or 'jdk' directory is found in an adjacent path to this 'bin' directory then
this will be used as the preferred runtime, else the installed system runtime is used.

NOTE: If you modify either of these batch files then ensure that there are no hidden
characters after the '^' continuation symbol (such as tab or space). But always ensure
there is a space before (and not a tab). The service installer will drop further options
and simply warn that '++JvmOptions' is unknown, leading to unexpected results.

++JvmOptions=-Dopenejb.home="%openejb%" ^
++JvmOptions=-Xms128M ^[tab or space] <-- Will break here, no further options will be appended
++JvmOptions=-Xmx512M ^
++JvmOptions=-XX:MaxPermSize=256M <-- Last line has no continuation symbol

Using the Monitor
=================
The file named 'OpenEJBServer.exe' can be used to modify service parameters post installation by running as an Administrator.
To use the monitor feature:

1. Create a shortcut to 'OpenEJBServer.exe' in your 'Startup' directory
2. Right click the shortcut and select 'Properties'
3. Edit the 'Target' field and append  //MS to the end of the line (Do not forget the preceding space ...\bin\OpenEJBServer.exe //MS)
\ No newline at end of file

Modified: tomee/tomee/branches/tomee-1.6.0.1/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedThreadFactoryImplFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedThreadFactoryImplFactory.java?rev=1587181&r1=1587180&r2=1587181&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedThreadFactoryImplFactory.java (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedThreadFactoryImplFactory.java Mon Apr 14 11:01:47 2014
@@ -1,3 +1,19 @@
+/**
+ * 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.concurrencyutilities.ee.factory;
 
 import org.apache.openejb.concurrencyutilities.ee.impl.ManagedThreadFactoryImpl;

Modified: tomee/tomee/branches/tomee-1.6.0.1/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/xa/CommonDataSourceAdapter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/xa/CommonDataSourceAdapter.java?rev=1587181&r1=1587180&r2=1587181&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/xa/CommonDataSourceAdapter.java (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/xa/CommonDataSourceAdapter.java Mon Apr 14 11:01:47 2014
@@ -1,3 +1,19 @@
+/**
+ * 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.resource.jdbc.managed.xa;
 
 import javax.sql.CommonDataSource;

Modified: tomee/tomee/branches/tomee-1.6.0.1/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java?rev=1587181&r1=1587180&r2=1587181&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java Mon Apr 14 11:01:47 2014
@@ -1,3 +1,19 @@
+/**
+ * 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.resource.jdbc.pool;
 
 import javax.naming.InitialContext;

Modified: tomee/tomee/branches/tomee-1.6.0.1/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/HessianRegistryImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/HessianRegistryImpl.java?rev=1587181&r1=1587180&r2=1587181&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/HessianRegistryImpl.java (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/HessianRegistryImpl.java Mon Apr 14 11:01:47 2014
@@ -1,3 +1,19 @@
+/**
+ * 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.hessian;
 
 import org.apache.openejb.OpenEJBRuntimeException;

Added: tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/TomEE.exe
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/TomEE.exe?rev=1587181&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/TomEE.exe
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/service.bat
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/service.bat?rev=1587181&r1=1587180&r2=1587181&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/service.bat (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/service.bat Mon Apr 14 11:01:47 2014
@@ -108,7 +108,7 @@ set "CATALINA_BASE=%CATALINA_HOME%"
 
 set "EXECUTABLE=%proc%"
 
-rem Set default Service name
+rem Set default Service name (If you change this then rename also TomEE.exe to the same name)
 set SERVICE_NAME=TomEE
 set PR_DISPLAYNAME=Apache TomEE
 
@@ -208,7 +208,7 @@ set PR_JVM=
 
 rem Set extra parameters
 "%EXECUTABLE%" //US//%SERVICE_NAME% ^
-	++JvmOptions "-Dcatalina.base=%CATALINA_BASE%;-Dcatalina.home=%CATALINA_HOME%;-Djava.endorsed.dirs=%CATALINA_HOME%\endorsed"
+	++JvmOptions "-javaagent:%CATALINA_HOME%\lib\openejb-javaagent.jar;-Dcatalina.base=%CATALINA_BASE%;-Dcatalina.home=%CATALINA_HOME%;-Djava.endorsed.dirs=%CATALINA_HOME%\endorsed"
 
 rem More extra parameters
 set "PR_LOGPATH=%CATALINA_BASE%\logs"

Modified: tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/service.readme.txt
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/service.readme.txt?rev=1587181&r1=1587180&r2=1587181&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/service.readme.txt (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/service.readme.txt Mon Apr 14 11:01:47 2014
@@ -1 +1 @@
-Windows NT Service
==================

The two batch files for creating and removing TomEE as a Windows Service are basically
self explanatory. Both scripts must be run using an account that has rights to install
or de-install a service. This is usually an administrator account.

service.install.as.admin.bat
service.remove.as.admin.bat

NOTE: Both scripts actually call the service.bat file, if you modify this batch file then ensure that there are no hidden
characters after the '^' continuation symbol (such as tab or space). But always ensure
there is a space before (and not a tab). The service installer will drop further options
and simply warn that '++JvmOptions' is unknown, leading to unexpected results.

++JvmOptions=-Dcatalina.base="%CATALINA_BASE%" ^
++JvmOptions=-Xms128M ^[tab or space] <-- Will break here, no further options will be appended
++JvmOptions=-Xmx512M ^
++JvmOptions=-XX:MaxPermSize=256M <-- Last line has no continuation symbol

Using a Defined JRE or JDK
==========================
The service script searches for and uses an installed Java runtime.
If you want to override this feature to use a specific runtime then edit the 'service.bat' file.

set "JAVA_HOME=[Full path to your JRE or JDK]"

Be aware if you override the runtime that the service installer uses native 32 bit x86, 64 bit ia64 and 64 bit amd64
executables to invoke the selected java runtime. For example, you cannot execute a 32 bit JRE using a 64 bit service.
If this is required then you will have to override the %PROCESSOR_ARCHITECTURE% variable.
\ No newline at end of file
+Windows NT Service
==================

The two batch files for creating and removing TomEE as a Windows Service are basically
self explanatory. Both scripts must be run using an account that has rights to install
or de-install a service. This is usually an administrator account.

service.install.as.admin.bat
service.remove.as.admin.bat

NOTE: Both scripts actually call the service.bat file, if you modify this batch file then ensure that there are no hidden
characters after the '^' continuation symbol (such as tab or space). But always ensure
there is a space before (and not a tab). The service installer will drop further options
and simply warn that '++JvmOptions' is unknown, leading to unexpected results.

++JvmOptions=-Dcatalina.base="%CATALINA_BASE%" ^
++JvmOptions=-Xms128M ^[tab or space] <-- Will break here, no further options will be appended
++JvmOptions=-Xmx512M ^
++JvmOptions=-XX:MaxPermSize=256M <-- Last line has no continuation symbol

Using a Defined JRE or JDK
==========================
The service script searches for and uses an installed Java runtime.
If you want to override this feature to use a specific runtime then edit the 'service.bat' file.

set "JAVA_HOME=[Full path to your JRE or JDK]"

Be aware if you override the runtime that the service installer uses native 32 bit x86, 64 bit ia64 and 64 bit amd64
executables to invoke the selected java runtime. For example, you cannot execute a 32 bit JRE using a 64 bit service.
If this is required then you will have to override the %PROCESSOR_ARCHITECTURE% variable.

Using the Monitor
=================
The file named 'TomEE.exe' can be used to modify service parameters post installation by running as an Administrator.
To use the monitor feature:

1. Create a shortcut to 'TomEE.exe' in your 'Startup' directory
2. Right click the shortcut and select 'Properties'
3. Edit the 'Target' field and append  //MS to the end of the line (Do not forget the preceding space ...\bin\TomEE.exe //MS)
\ No newline at end of file

Added: tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/tomcat-native.tar.gz
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/tomcat-native.tar.gz?rev=1587181&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/src/main/resources/tomcat-native.tar.gz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-common/src/main/java/org/apache/tomee/installer/InstallerTools.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-common/src/main/java/org/apache/tomee/installer/InstallerTools.java?rev=1587181&r1=1587180&r2=1587181&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-common/src/main/java/org/apache/tomee/installer/InstallerTools.java (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-common/src/main/java/org/apache/tomee/installer/InstallerTools.java Mon Apr 14 11:01:47 2014
@@ -1,3 +1,19 @@
+/*
+ * 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.installer;
 
 import java.lang.reflect.Method;

Modified: tomee/tomee/branches/tomee-1.6.0.1/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockRegistry.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/utils/openejb-mockito/src/main/java/org/apache/openejb/mockito/MockRegistry.java?rev=1587181&r1=1587180&r2=1587181&view=diff
==============================================================================
    (empty)