Author: dblevins Date: Thu May 28 07:48:04 2009 New Revision: 779467 URL: http://svn.apache.org/viewvc?rev=779467&view=rev Log: Merging r779466 - http://svn.apache.org/viewvc?rev=779466&view=rev
svn merge -r 779465:779466 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 . ------------------------------------------------------------------------ r779466 | dblevins | 2009-05-28 00:47:33 -0700 (Thu, 28 May 2009) | 1 line A couple more license headers ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.1.1/ (props changed) openejb/branches/openejb-3.1.1/examples/webservice-ws-security/src/main/resources/META-INF/openejb-jar.xml openejb/branches/openejb-3.1.1/examples/webservice-ws-security/src/main/resources/META-INF/webservices.xml Propchange: openejb/branches/openejb-3.1.1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 28 07:48:04 2009 @@ -1 +1 @@ -/openejb/trunk/openejb3:778585,778808,778810,779453-779454,779464 +/openejb/trunk/openejb3:778585,778808,778810,779453-779454,779464,779466 Modified: openejb/branches/openejb-3.1.1/examples/webservice-ws-security/src/main/resources/META-INF/openejb-jar.xml URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/examples/webservice-ws-security/src/main/resources/META-INF/openejb-jar.xml?rev=779467&r1=779466&r2=779467&view=diff ============================================================================== --- openejb/branches/openejb-3.1.1/examples/webservice-ws-security/src/main/resources/META-INF/openejb-jar.xml (original) +++ openejb/branches/openejb-3.1.1/examples/webservice-ws-security/src/main/resources/META-INF/openejb-jar.xml Thu May 28 07:48:04 2009 @@ -1,3 +1,19 @@ +<?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.1/examples/webservice-ws-security/src/main/resources/META-INF/webservices.xml URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/examples/webservice-ws-security/src/main/resources/META-INF/webservices.xml?rev=779467&r1=779466&r2=779467&view=diff ============================================================================== --- openejb/branches/openejb-3.1.1/examples/webservice-ws-security/src/main/resources/META-INF/webservices.xml (original) +++ openejb/branches/openejb-3.1.1/examples/webservice-ws-security/src/main/resources/META-INF/webservices.xml Thu May 28 07:48:04 2009 @@ -1,4 +1,19 @@ <?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. +--> <webservices xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd";
