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/05/28 09:41:41 UTC
svn commit: r779465 - in /openejb/branches/openejb-3.1.1: ./
container/openejb-api/src/main/java/org/apache/openejb/api/
container/openejb-core/src/test/java/org/apache/openejb/util/
container/openejb-spring/src/main/java/org/apache/openejb/spring/ exa...
Author: dblevins
Date: Thu May 28 07:41:40 2009
New Revision: 779465
URL: http://svn.apache.org/viewvc?rev=779465&view=rev
Log:
Merging r779464 - http://svn.apache.org/viewvc?rev=779464&view=rev
svn merge -r 779463:779464 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 .
------------------------------------------------------------------------
r779464 | dblevins | 2009-05-28 00:40:41 -0700 (Thu, 28 May 2009) | 2 lines
Added some missing license headers
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-3.1.1/ (props changed)
openejb/branches/openejb-3.1.1/container/openejb-api/src/main/java/org/apache/openejb/api/RemoteClient.java
openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/util/HexConverterTest.java
openejb/branches/openejb-3.1.1/container/openejb-spring/src/main/java/org/apache/openejb/spring/Exported.java
openejb/branches/openejb-3.1.1/examples/simple-webservice/src/main/java/org/superbiz/handler/DummyInterceptor.java
openejb/branches/openejb-3.1.1/examples/webservice-ws-security/keys/generateKeyPair.bat
openejb/branches/openejb-3.1.1/examples/webservice-ws-security/keys/generateServerKey.bat
openejb/branches/openejb-3.1.1/examples/webservice-ws-security/src/main/java/org/superbiz/calculator/CalculatorRemote.java
openejb/branches/openejb-3.1.1/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/object/Color.java
openejb/branches/openejb-3.1.1/server/openejb-client/src/main/java/org/apache/openejb/client/InterfaceType.java
openejb/branches/openejb-3.1.1/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ConfigureCxfSecurity.java
Propchange: openejb/branches/openejb-3.1.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 28 07:41:40 2009
@@ -1 +1 @@
-/openejb/trunk/openejb3:778585,778808,778810,779453-779454
+/openejb/trunk/openejb3:778585,778808,778810,779453-779454,779464
Modified: openejb/branches/openejb-3.1.1/container/openejb-api/src/main/java/org/apache/openejb/api/RemoteClient.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/container/openejb-api/src/main/java/org/apache/openejb/api/RemoteClient.java?rev=779465&r1=779464&r2=779465&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/container/openejb-api/src/main/java/org/apache/openejb/api/RemoteClient.java (original)
+++ openejb/branches/openejb-3.1.1/container/openejb-api/src/main/java/org/apache/openejb/api/RemoteClient.java Thu May 28 07:41:40 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.
+ */
package org.apache.openejb.api;
import java.lang.annotation.Target;
Modified: openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/util/HexConverterTest.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/util/HexConverterTest.java?rev=779465&r1=779464&r2=779465&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/util/HexConverterTest.java (original)
+++ openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/util/HexConverterTest.java Thu May 28 07:41:40 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.
+ */
package org.apache.openejb.util;
import static junit.framework.Assert.assertEquals;
Modified: openejb/branches/openejb-3.1.1/container/openejb-spring/src/main/java/org/apache/openejb/spring/Exported.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/container/openejb-spring/src/main/java/org/apache/openejb/spring/Exported.java?rev=779465&r1=779464&r2=779465&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/container/openejb-spring/src/main/java/org/apache/openejb/spring/Exported.java (original)
+++ openejb/branches/openejb-3.1.1/container/openejb-spring/src/main/java/org/apache/openejb/spring/Exported.java Thu May 28 07:41:40 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.
+ */
package org.apache.openejb.spring;
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
Modified: openejb/branches/openejb-3.1.1/examples/simple-webservice/src/main/java/org/superbiz/handler/DummyInterceptor.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/examples/simple-webservice/src/main/java/org/superbiz/handler/DummyInterceptor.java?rev=779465&r1=779464&r2=779465&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/examples/simple-webservice/src/main/java/org/superbiz/handler/DummyInterceptor.java (original)
+++ openejb/branches/openejb-3.1.1/examples/simple-webservice/src/main/java/org/superbiz/handler/DummyInterceptor.java Thu May 28 07:41:40 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.
+ */
package org.superbiz.handler;
import java.util.Collections;
Modified: openejb/branches/openejb-3.1.1/examples/webservice-ws-security/keys/generateKeyPair.bat
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/examples/webservice-ws-security/keys/generateKeyPair.bat?rev=779465&r1=779464&r2=779465&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/examples/webservice-ws-security/keys/generateKeyPair.bat (original)
+++ openejb/branches/openejb-3.1.1/examples/webservice-ws-security/keys/generateKeyPair.bat Thu May 28 07:41:40 2009
@@ -1,3 +1,23 @@
+@echo off
+REM================================================
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM _______________________________________________
+REM $Rev: 636963 $ $Date: 2008-03-13 19:40:08 -0700 (Thu, 13 Mar 2008) $
+REM================================================
+
rem @echo off
echo alias %1
echo keypass %2
Modified: openejb/branches/openejb-3.1.1/examples/webservice-ws-security/keys/generateServerKey.bat
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/examples/webservice-ws-security/keys/generateServerKey.bat?rev=779465&r1=779464&r2=779465&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/examples/webservice-ws-security/keys/generateServerKey.bat (original)
+++ openejb/branches/openejb-3.1.1/examples/webservice-ws-security/keys/generateServerKey.bat Thu May 28 07:41:40 2009
@@ -1,3 +1,23 @@
+@echo off
+REM================================================
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM _______________________________________________
+REM $Rev: 636963 $ $Date: 2008-03-13 19:40:08 -0700 (Thu, 13 Mar 2008) $
+REM================================================
+
call generateKeyPair.bat serveralias serverPassword serverStore.jks keystorePass serverKey.rsa
call generateKeyPair.bat clientalias clientPassword clientStore.jks keystorePass clientKey.rsa
keytool -import -alias serveralias -file serverKey.rsa -keystore clientStore.jks -storepass keystorePass -noprompt
Modified: openejb/branches/openejb-3.1.1/examples/webservice-ws-security/src/main/java/org/superbiz/calculator/CalculatorRemote.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/examples/webservice-ws-security/src/main/java/org/superbiz/calculator/CalculatorRemote.java?rev=779465&r1=779464&r2=779465&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/examples/webservice-ws-security/src/main/java/org/superbiz/calculator/CalculatorRemote.java (original)
+++ openejb/branches/openejb-3.1.1/examples/webservice-ws-security/src/main/java/org/superbiz/calculator/CalculatorRemote.java Thu May 28 07:41:40 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.
+ */
package org.superbiz.calculator;
import javax.ejb.Remote;
Modified: openejb/branches/openejb-3.1.1/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/object/Color.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/object/Color.java?rev=779465&r1=779464&r2=779465&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/object/Color.java (original)
+++ openejb/branches/openejb-3.1.1/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/object/Color.java Thu May 28 07:41:40 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.
+ */
package org.apache.openejb.test.object;
/**
Modified: openejb/branches/openejb-3.1.1/server/openejb-client/src/main/java/org/apache/openejb/client/InterfaceType.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/server/openejb-client/src/main/java/org/apache/openejb/client/InterfaceType.java?rev=779465&r1=779464&r2=779465&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/server/openejb-client/src/main/java/org/apache/openejb/client/InterfaceType.java (original)
+++ openejb/branches/openejb-3.1.1/server/openejb-client/src/main/java/org/apache/openejb/client/InterfaceType.java Thu May 28 07:41:40 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.
+ */
package org.apache.openejb.client;
/**
Modified: openejb/branches/openejb-3.1.1/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ConfigureCxfSecurity.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ConfigureCxfSecurity.java?rev=779465&r1=779464&r2=779465&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ConfigureCxfSecurity.java (original)
+++ openejb/branches/openejb-3.1.1/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ConfigureCxfSecurity.java Thu May 28 07:41:40 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.
+ */
package org.apache.openejb.server.cxf;
import java.util.HashMap;