You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2009/10/14 01:37:02 UTC
svn commit: r824974 - in /openejb/branches/openejb-3.1.2: ./
container/openejb-core/src/test/java/org/apache/openejb/config/ examples/
examples/alternate-descriptors/src/main/resources/META-INF/
examples/simple-cmp2/src/main/resources/META-INF/ example...
Author: dblevins
Date: Tue Oct 13 23:37:01 2009
New Revision: 824974
URL: http://svn.apache.org/viewvc?rev=824974&view=rev
Log:
Merging r824917 - http://svn.apache.org/viewvc?rev=824917&view=rev
svn merge -r 824916:824917 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 .
------------------------------------------------------------------------
r824917 | dblevins | 2009-10-13 13:42:23 -0700 (Tue, 13 Oct 2009) | 2 lines
Updated copyright year on notices. Added license headers.
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-3.1.2/ (props changed)
openejb/branches/openejb-3.1.2/NOTICE
openejb/branches/openejb-3.1.2/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed)
openejb/branches/openejb-3.1.2/examples/NOTICE.txt
openejb/branches/openejb-3.1.2/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed)
openejb/branches/openejb-3.1.2/examples/simple-cmp2/src/main/resources/META-INF/ejb-jar.xml
openejb/branches/openejb-3.1.2/examples/simple-mdb-with-descriptor/src/main/resources/META-INF/ejb-jar.xml
openejb/branches/openejb-3.1.2/examples/simple-stateless-with-descriptor/src/main/resources/META-INF/ejb-jar.xml
openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/default.css
openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/index.jsp
openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/setup.jsp
openejb/branches/openejb-3.1.2/examples/webservice-security/src/main/resources/META-INF/openejb-jar.xml
openejb/branches/openejb-3.1.2/examples/webservice-ws-security/src/main/resources/META-INF/ejb-jar.xml
Propchange: openejb/branches/openejb-3.1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 23:37:01 2009
@@ -1,2 +1,2 @@
/openejb/branches/openejb-3.1.1:779593
-/openejb/trunk/openejb3:823293,823642,823667,823678,823709,823768-823819
+/openejb/trunk/openejb3:823293,823642,823667,823678,823709,823768-823819,824917
Modified: openejb/branches/openejb-3.1.2/NOTICE
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.2/NOTICE?rev=824974&r1=824973&r2=824974&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.2/NOTICE (original)
+++ openejb/branches/openejb-3.1.2/NOTICE Tue Oct 13 23:37:01 2009
@@ -1,6 +1,6 @@
Apache OpenEJB
-Copyright 1999-2008 The Apache OpenEJB development community
+Copyright 1999-2009 The Apache OpenEJB development community
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Propchange: openejb/branches/openejb-3.1.2/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 23:37:01 2009
@@ -1,2 +1,2 @@
/openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
-/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:823293,823642,823667,823678,823709,823768-823819
+/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:823293,823642,823667,823678,823709,823768-823819,824917
Modified: openejb/branches/openejb-3.1.2/examples/NOTICE.txt
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.2/examples/NOTICE.txt?rev=824974&r1=824973&r2=824974&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.2/examples/NOTICE.txt (original)
+++ openejb/branches/openejb-3.1.2/examples/NOTICE.txt Tue Oct 13 23:37:01 2009
@@ -4,7 +4,7 @@
// ------------------------------------------------------------------
Apache OpenEJB
-Copyright 1999-2008 The Apache OpenEJB development community
+Copyright 1999-2009 The Apache OpenEJB development community
This product includes/uses software, HSQLDB (http://hsqldb.org/)
Propchange: openejb/branches/openejb-3.1.2/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 23:37:01 2009
@@ -1,2 +1,2 @@
/openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
-/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:823293,823642,823667,823678,823709,823768-823819
+/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:823293,823642,823667,823678,823709,823768-823819,824917
Modified: openejb/branches/openejb-3.1.2/examples/simple-cmp2/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.2/examples/simple-cmp2/src/main/resources/META-INF/ejb-jar.xml?rev=824974&r1=824973&r2=824974&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.2/examples/simple-cmp2/src/main/resources/META-INF/ejb-jar.xml (original)
+++ openejb/branches/openejb-3.1.2/examples/simple-cmp2/src/main/resources/META-INF/ejb-jar.xml Tue Oct 13 23:37:01 2009
@@ -1,3 +1,21 @@
+<?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.
+-->
<ejb-jar>
<enterprise-beans>
<entity>
Modified: openejb/branches/openejb-3.1.2/examples/simple-mdb-with-descriptor/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.2/examples/simple-mdb-with-descriptor/src/main/resources/META-INF/ejb-jar.xml?rev=824974&r1=824973&r2=824974&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.2/examples/simple-mdb-with-descriptor/src/main/resources/META-INF/ejb-jar.xml (original)
+++ openejb/branches/openejb-3.1.2/examples/simple-mdb-with-descriptor/src/main/resources/META-INF/ejb-jar.xml Tue Oct 13 23:37:01 2009
@@ -1,3 +1,21 @@
+<?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.
+-->
<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
Modified: openejb/branches/openejb-3.1.2/examples/simple-stateless-with-descriptor/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.2/examples/simple-stateless-with-descriptor/src/main/resources/META-INF/ejb-jar.xml?rev=824974&r1=824973&r2=824974&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.2/examples/simple-stateless-with-descriptor/src/main/resources/META-INF/ejb-jar.xml (original)
+++ openejb/branches/openejb-3.1.2/examples/simple-stateless-with-descriptor/src/main/resources/META-INF/ejb-jar.xml Tue Oct 13 23:37:01 2009
@@ -1,3 +1,21 @@
+<?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.
+-->
<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
Modified: openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/default.css
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/default.css?rev=824974&r1=824973&r2=824974&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/default.css (original)
+++ openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/default.css Tue Oct 13 23:37:01 2009
@@ -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.
+-->
+
body, p, td, table, tr, .bodytext, .stepfield {
font-family: Verdana, arial, sans-serif;
font-size: 11px;
Modified: openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/index.jsp?rev=824974&r1=824973&r2=824974&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/index.jsp (original)
+++ openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/index.jsp Tue Oct 13 23:37:01 2009
@@ -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.
+--%>
<%@ page import="org.superbiz.moviefun.Movie,
org.superbiz.moviefun.Movies,
javax.naming.InitialContext,
Modified: openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/setup.jsp
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/setup.jsp?rev=824974&r1=824973&r2=824974&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/setup.jsp (original)
+++ openejb/branches/openejb-3.1.2/examples/webapps/moviefun/src/main/webapp/setup.jsp Tue Oct 13 23:37:01 2009
@@ -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.
+--%>
<%@ page import=" java.util.Iterator"%>
<%@ page import="org.superbiz.moviefun.Movies" %>
<%@ page import="javax.naming.InitialContext" %>
Modified: openejb/branches/openejb-3.1.2/examples/webservice-security/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.2/examples/webservice-security/src/main/resources/META-INF/openejb-jar.xml?rev=824974&r1=824973&r2=824974&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.2/examples/webservice-security/src/main/resources/META-INF/openejb-jar.xml (original)
+++ openejb/branches/openejb-3.1.2/examples/webservice-security/src/main/resources/META-INF/openejb-jar.xml Tue Oct 13 23:37:01 2009
@@ -1,3 +1,21 @@
+<?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-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
<enterprise-beans>
<session>
Modified: openejb/branches/openejb-3.1.2/examples/webservice-ws-security/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.2/examples/webservice-ws-security/src/main/resources/META-INF/ejb-jar.xml?rev=824974&r1=824973&r2=824974&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.2/examples/webservice-ws-security/src/main/resources/META-INF/ejb-jar.xml (original)
+++ openejb/branches/openejb-3.1.2/examples/webservice-ws-security/src/main/resources/META-INF/ejb-jar.xml Tue Oct 13 23:37:01 2009
@@ -1,4 +1,21 @@
<?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.
+-->
<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
version="3.0" id="simple" metadata-complete="false">