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 2010/10/16 02:31:04 UTC
svn commit: r1023163 - in /openejb/trunk/openejb3: ./
container/openejb-core/ container/openejb-core/src/main/resources/schema/
container/openejb-core/src/test/java/org/apache/openejb/config/
examples/alternate-descriptors/src/main/resources/META-INF/ ...
Author: dblevins
Date: Sat Oct 16 00:31:04 2010
New Revision: 1023163
URL: http://svn.apache.org/viewvc?rev=1023163&view=rev
Log:
svn merge -r 1023124:1023125 https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x
http://svn.apache.org/viewvc?view=revision&revision=1023125
------------------------------------------------------------------------
r1023125 | dblevins | 2010-10-15 14:50:51 -0700 (Fri, 15 Oct 2010) | 2 lines
Added missing headers
------------------------------------------------------------------------
Removed:
openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/ejb-jar_1_1.xsd
Modified:
openejb/trunk/openejb3/ (props changed)
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed)
openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed)
openejb/trunk/openejb3/examples/quartz-app/pom.xml
openejb/trunk/openejb3/examples/quartz-app/quartz-beans/pom.xml
openejb/trunk/openejb3/examples/quartz-app/quartz-ra/pom.xml
openejb/trunk/openejb3/examples/webapps/ejb-webservice/client.pl
openejb/trunk/openejb3/examples/webapps/moviefun/delete-movie.pl
openejb/trunk/openejb3/examples/webapps/moviefun/get-movies.pl
openejb/trunk/openejb3/examples/webservice-ws-security/create-keystores.xml
openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml
Propchange: openejb/trunk/openejb3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 16 00:31:04 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1:779593
-/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096
+/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023125
/openejb/branches/openejb-jcdi:984659-985270
Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=1023163&r1=1023162&r2=1023163&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Sat Oct 16 00:31:04 2010
@@ -196,7 +196,6 @@
<exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.examples</exclude>
<exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.help</exclude>
<exclude>src/main/resources/META-INF/org.apache.openejb.resource.jdbc.DataSourcePlugin/*</exclude>
- <exclude>src/main/resources/schema/ejb-jar_1_1.xsd</exclude>
<exclude>src/main/resources/META-INF/services/org/apache/activemq/broker/openejb</exclude>
</excludes>
</configuration>
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 16 00:31:04 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
-/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096
+/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023125
/openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:984659-985270
Propchange: openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 16 00:31:04 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
-/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096
+/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023125
/openejb/branches/openejb-jcdi/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:984659-985270
Modified: openejb/trunk/openejb3/examples/quartz-app/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/quartz-app/pom.xml?rev=1023163&r1=1023162&r2=1023163&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/quartz-app/pom.xml (original)
+++ openejb/trunk/openejb3/examples/quartz-app/pom.xml Sat Oct 16 00:31:04 2010
@@ -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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
Modified: openejb/trunk/openejb3/examples/quartz-app/quartz-beans/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/quartz-app/quartz-beans/pom.xml?rev=1023163&r1=1023162&r2=1023163&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/quartz-app/quartz-beans/pom.xml (original)
+++ openejb/trunk/openejb3/examples/quartz-app/quartz-beans/pom.xml Sat Oct 16 00:31:04 2010
@@ -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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
Modified: openejb/trunk/openejb3/examples/quartz-app/quartz-ra/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/quartz-app/quartz-ra/pom.xml?rev=1023163&r1=1023162&r2=1023163&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/quartz-app/quartz-ra/pom.xml (original)
+++ openejb/trunk/openejb3/examples/quartz-app/quartz-ra/pom.xml Sat Oct 16 00:31:04 2010
@@ -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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
Modified: openejb/trunk/openejb3/examples/webapps/ejb-webservice/client.pl
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/ejb-webservice/client.pl?rev=1023163&r1=1023162&r2=1023163&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/ejb-webservice/client.pl (original)
+++ openejb/trunk/openejb3/examples/webapps/ejb-webservice/client.pl Sat Oct 16 00:31:04 2010
@@ -1,4 +1,20 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
+#============================================================
+# 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.
+#============================================================
use SOAP::Lite;
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/delete-movie.pl
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/delete-movie.pl?rev=1023163&r1=1023162&r2=1023163&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/delete-movie.pl (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/delete-movie.pl Sat Oct 16 00:31:04 2010
@@ -1,4 +1,20 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
+#============================================================
+# 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.
+#============================================================
#use SOAP::Lite 'trace', 'debug';
use SOAP::Lite;
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/get-movies.pl
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/get-movies.pl?rev=1023163&r1=1023162&r2=1023163&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/get-movies.pl (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/get-movies.pl Sat Oct 16 00:31:04 2010
@@ -1,4 +1,20 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
+#============================================================
+# 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.
+#============================================================
#use SOAP::Lite 'trace', 'debug';
use SOAP::Lite;
Modified: openejb/trunk/openejb3/examples/webservice-ws-security/create-keystores.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webservice-ws-security/create-keystores.xml?rev=1023163&r1=1023162&r2=1023163&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webservice-ws-security/create-keystores.xml (original)
+++ openejb/trunk/openejb3/examples/webservice-ws-security/create-keystores.xml Sat Oct 16 00:31:04 2010
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
<project default="run" name="create keystores et al" >
Modified: openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml?rev=1023163&r1=1023162&r2=1023163&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml Sat Oct 16 00:31:04 2010
@@ -2,17 +2,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.
+ 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: 684173 $ $Date: 2008-08-08 20:13:24 -0700 (Fri, 08 Aug 2008) $ -->