You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/05/14 18:16:37 UTC

svn commit: r944334 - in /geronimo/external/branches/openejb-3.1.3-r942249: ./ container/ container/openejb-activemq4/src/main/resources/ container/openejb-core/src/main/resources/ container/openejb-core/src/test/resources/altddPU1/META-INF/ container/...

Author: rickmcguire
Date: Fri May 14 16:16:36 2010
New Revision: 944334

URL: http://svn.apache.org/viewvc?rev=944334&view=rev
Log:
Fix some Rat issues, remove unused junit subproject, update NOTICE copyright

Removed:
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-junit/
Modified:
    geronimo/external/branches/openejb-3.1.3-r942249/NOTICE
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/default.openejb.conf
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/groups.properties
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/logging.properties
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/users.properties
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/users.properties
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddPU1/META-INF/bartest.ejb-jar.xml
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp1/META-INF/test.ejb-jar.xml
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/ejb-jar.xml
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/footest.ejb-jar.xml
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/test.ejb-jar.xml
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/test.env-entries.properties
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/geronimo-openejb.xml
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar-expected.xml
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar.xml
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/mixedcase/mEta-iNf/ejb-jar.xml
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/filtered-resources/features.xml
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/logging.properties
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-spring/src/test/resources/META-INF/ejb-jar.xml
    geronimo/external/branches/openejb-3.1.3-r942249/container/pom.xml

Modified: geronimo/external/branches/openejb-3.1.3-r942249/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/NOTICE?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/NOTICE (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/NOTICE Fri May 14 16:16:36 2010
@@ -1,6 +1,6 @@
 
 Apache OpenEJB
-Copyright 1999-2009 The Apache OpenEJB development community
+Copyright 1999-2010 The Apache OpenEJB development community
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/default.openejb.conf
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/default.openejb.conf?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/default.openejb.conf (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/default.openejb.conf Fri May 14 16:16:36 2010
@@ -1,4 +1,20 @@
 <?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.
+-->
 <openejb>
 
 <Container id="My CMP Container" type="CMP_ENTITY">

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/groups.properties
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/groups.properties?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/groups.properties (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/groups.properties Fri May 14 16:16:36 2010
@@ -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.
+# =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~
 committer=jonathan
 contributor=daniel
 community=jonathan,daniel

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/logging.properties
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/logging.properties?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/logging.properties (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/logging.properties Fri May 14 16:16:36 2010
@@ -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.
+# =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~
 # ---------------------------------------------------
 # The configuration below is good for standalone
 # scenarios.  There's a log file and everything is

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/users.properties
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/users.properties?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/users.properties (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/users.properties Fri May 14 16:16:36 2010
@@ -1,2 +1,18 @@
+# =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~
+#  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.
+# =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~
 jonathan=secret
 daniel=password

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/users.properties
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/users.properties?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/users.properties (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/users.properties Fri May 14 16:16:36 2010
@@ -1,2 +1,18 @@
+# =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~
+#  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.
+# =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~
 jonathan=secret
 daniel=password

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddPU1/META-INF/bartest.ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddPU1/META-INF/bartest.ejb-jar.xml?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddPU1/META-INF/bartest.ejb-jar.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddPU1/META-INF/bartest.ejb-jar.xml Fri May 14 16:16:36 2010
@@ -1,3 +1,20 @@
+<!--
+
+    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.
+-->
 <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" version="3.0" metadata-complete="false">
   <enterprise-beans>
     <session>

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp1/META-INF/test.ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp1/META-INF/test.ejb-jar.xml?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp1/META-INF/test.ejb-jar.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp1/META-INF/test.ejb-jar.xml Fri May 14 16:16:36 2010
@@ -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.
+-->
 <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" version="3.0" metadata-complete="false">
   <enterprise-beans>
     <session>

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/ejb-jar.xml?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/ejb-jar.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/ejb-jar.xml Fri May 14 16:16:36 2010
@@ -1 +1,17 @@
+<!--
+    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.
+-->
 <ejb-jar/>
\ No newline at end of file

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/footest.ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/footest.ejb-jar.xml?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/footest.ejb-jar.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/footest.ejb-jar.xml Fri May 14 16:16:36 2010
@@ -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.
+-->
 <ejb-jar>
   <enterprise-beans>
     <session id="OrangeBean">
@@ -21,4 +37,3 @@
     </interceptor-binding>
   </assembly-descriptor>
 </ejb-jar>
-  
\ No newline at end of file

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/test.ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/test.ejb-jar.xml?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/test.ejb-jar.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/test.ejb-jar.xml Fri May 14 16:16:36 2010
@@ -1 +1,17 @@
+<!--
+    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.
+-->
 <ejb-jar/>
\ No newline at end of file

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/test.env-entries.properties
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/test.env-entries.properties?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/test.env-entries.properties (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/altddapp2/META-INF/test.env-entries.properties Fri May 14 16:16:36 2010
@@ -1,3 +1,21 @@
+################################################################################
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+################################################################################
 one=1
 two=2
 three=3

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/geronimo-openejb.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/geronimo-openejb.xml?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/geronimo-openejb.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/geronimo-openejb.xml Fri May 14 16:16:36 2010
@@ -1,4 +1,20 @@
 <?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.
+-->
 <ns5:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/openejb-clustering-wadi-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns5="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns6="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns7="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns8="http://java.sun.com/xml/ns/persistence" xmlns:ns9="http://openejb.apache.org/xml/ns/pkgen-2.1">
     <environment>
         <moduleId>

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar-expected.xml?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar-expected.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar-expected.xml Fri May 14 16:16:36 2010
@@ -1,4 +1,20 @@
 <?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.
+-->
 <openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1">
     <properties>module.property.b=valueb
 module.property.a=valuea

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar.xml?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar.xml Fri May 14 16:16:36 2010
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+    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.
+-->
 <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
   <dep:environment>
     <dep:moduleId>

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/mixedcase/mEta-iNf/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/mixedcase/mEta-iNf/ejb-jar.xml?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/mixedcase/mEta-iNf/ejb-jar.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/test/resources/mixedcase/mEta-iNf/ejb-jar.xml Fri May 14 16:16:36 2010
@@ -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.
+-->
 <ejb-jar>
   <enterprise-beans>
     <session id="OrangeBean">

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/filtered-resources/features.xml?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/filtered-resources/features.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/filtered-resources/features.xml Fri May 14 16:16:36 2010
@@ -1,19 +1,20 @@
 <?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
 
-        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
 
-        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.
-    -->
+    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.
+-->
     <!--
         TODO: Start with hard coded versions. Next step will be to use maven
         filters

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/logging.properties
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/logging.properties?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/logging.properties (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/logging.properties Fri May 14 16:16:36 2010
@@ -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.
+# =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~
 # ---------------------------------------------------
 # The configuration below is good for standalone
 # scenarios.  There's a log file and everything is

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-spring/src/test/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-spring/src/test/resources/META-INF/ejb-jar.xml?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-spring/src/test/resources/META-INF/ejb-jar.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-spring/src/test/resources/META-INF/ejb-jar.xml Fri May 14 16:16:36 2010
@@ -1,2 +1,18 @@
+<!--
+    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.
+-->
 <!-- this is here so the ejbs in the test code are discovered and deployed -->
 <ejb-jar/>
\ No newline at end of file

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/pom.xml?rev=944334&r1=944333&r2=944334&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/pom.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/pom.xml Fri May 14 16:16:36 2010
@@ -34,6 +34,5 @@
         <module>openejb-spring</module>
         <module>openejb-osgi</module>
         <module>openejb-activemq4</module>
-        <module>openejb-junit</module>
     </modules>
 </project>
\ No newline at end of file