You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/09/08 21:06:51 UTC

svn commit: r812650 - in /incubator/openwebbeans/trunk: samples/ samples/guess/src/site/ samples/src/site/ src/site/ webbeans-api/src/main/java/javax/enterprise/inject/ webbeans-api/src/site/ webbeans-impl/src/site/

Author: gerdogdu
Date: Tue Sep  8 19:06:51 2009
New Revision: 812650

URL: http://svn.apache.org/viewvc?rev=812650&view=rev
Log:
update Apache copyright contents

Modified:
    incubator/openwebbeans/trunk/samples/guess/src/site/site.xml
    incubator/openwebbeans/trunk/samples/pom.xml
    incubator/openwebbeans/trunk/samples/src/site/site.xml
    incubator/openwebbeans/trunk/src/site/site.xml
    incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/ResolutionException.java
    incubator/openwebbeans/trunk/webbeans-api/src/site/site.xml
    incubator/openwebbeans/trunk/webbeans-impl/src/site/site.xml

Modified: incubator/openwebbeans/trunk/samples/guess/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/site/site.xml?rev=812650&r1=812649&r2=812650&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/site/site.xml (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/site/site.xml Tue Sep  8 19:06:51 2009
@@ -1,19 +1,18 @@
 <?xml version="1.0"?>
 <!--
-  | Copyright 2007-2008 The Apache Software Foundation.
-  |
-  | Licensed 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.
-  |
+	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 name="OpenWebBeans-Samples-Guess">

Modified: incubator/openwebbeans/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/pom.xml?rev=812650&r1=812649&r2=812650&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/pom.xml Tue Sep  8 19:06:51 2009
@@ -33,4 +33,51 @@
            <module>jms-sample</module>
            <module>reservation</module>
         </modules>
+	<build>
+	<plugins>
+	      <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.0.2</version>
+                    <configuration>
+                        <archiveClasses>true</archiveClasses>
+                        <archive>
+                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                            <addMavenDescriptor>false</addMavenDescriptor>
+                        </archive>
+
+                        <!--
+                        HACK: Include legal files explicity, otherwise they will end up in the wrong path
+                              or in another jar file in the war.
+
+                        NOTE: targetPath is broken for webResources (as documented)
+                        -->
+                        <webResources>
+                            <resource>
+                                <directory>.</directory>
+				<targetPath>META-INF</targetPath>
+                                <includes>
+                                    <include>LICENCE.txt</include>
+                                    <include>NOTICE.txt</include>
+				    <include>licences/*</include>
+                                    <include>DISCLAIMER</include>
+                                </includes>
+                            </resource>
+                        </webResources>
+		            <archive>
+		                <manifestEntries>
+		                    <Specification-Title>${project.name}</Specification-Title>
+		                    <Specification-Version>${project.version}</Specification-Version>
+		                    <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+		                    <Implementation-Title>${project.name}</Implementation-Title>
+		                    <Implementation-Version>${project.version}</Implementation-Version>
+		                    <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+		                    <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+		                </manifestEntries>
+		            </archive>
+
+                    </configuration>
+             </plugin>
+	</plugins>
+	</build>
 </project>

Modified: incubator/openwebbeans/trunk/samples/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/src/site/site.xml?rev=812650&r1=812649&r2=812650&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/src/site/site.xml (original)
+++ incubator/openwebbeans/trunk/samples/src/site/site.xml Tue Sep  8 19:06:51 2009
@@ -1,19 +1,18 @@
 <?xml version="1.0"?>
 <!--
-  | Copyright 2007-2008 The Apache Software Foundation.
-  |
-  | Licensed 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.
-  |
+	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 name="OpenWebBeans-Samples">

Modified: incubator/openwebbeans/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/src/site/site.xml?rev=812650&r1=812649&r2=812650&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/src/site/site.xml (original)
+++ incubator/openwebbeans/trunk/src/site/site.xml Tue Sep  8 19:06:51 2009
@@ -1,19 +1,18 @@
 <?xml version="1.0"?>
 <!--
-  | Copyright 2007-2008 The Apache Software Foundation.
-  |
-  | Licensed 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.
-  |
+	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 name="OpenWebBeans">

Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/ResolutionException.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/ResolutionException.java?rev=812650&r1=812649&r2=812650&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/ResolutionException.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/ResolutionException.java Tue Sep  8 19:06:51 2009
@@ -1,18 +1,15 @@
 /*
- *  Copyright 2009 gurkanerdogdu.
- * 
- *  Licensed 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.
- *  under the License.
+ * 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 javax.enterprise.inject;
 

Modified: incubator/openwebbeans/trunk/webbeans-api/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/site/site.xml?rev=812650&r1=812649&r2=812650&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/site/site.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/site/site.xml Tue Sep  8 19:06:51 2009
@@ -1,19 +1,18 @@
 <?xml version="1.0"?>
 <!--
-  | Copyright 2007-2008 The Apache Software Foundation.
-  |
-  | Licensed 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.
-  |
+	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 name="OpenWebBeans-API">

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/site/site.xml?rev=812650&r1=812649&r2=812650&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/site/site.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/site/site.xml Tue Sep  8 19:06:51 2009
@@ -1,19 +1,18 @@
 <?xml version="1.0"?>
 <!--
-  | Copyright 2007-2008 The Apache Software Foundation.
-  |
-  | Licensed 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.
-  |
+	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 name="OpenWebBeans-Impl">