Author: matzew
Date: Wed Jan 17 02:10:25 2007
New Revision: 496981
URL: http://svn.apache.org/viewvc?view=rev&rev=496981
Log:
put improvements to the RC1 release to trunk of plugins
(see email dicussion for more...)
Added:
incubator/adffaces/trunk/plugins/INCUBATOR_NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/INCUBATOR_NOTICE.txt
incubator/adffaces/trunk/plugins/maven-faces-plugin/INCUBATOR_NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-faces-plugin/INCUBATOR_NOTICE.txt
incubator/adffaces/trunk/plugins/maven-faces-plugin/LICENSE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-faces-plugin/LICENSE.txt
incubator/adffaces/trunk/plugins/maven-faces-plugin/NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-faces-plugin/NOTICE.txt
incubator/adffaces/trunk/plugins/maven-i18n-plugin/INCUBATOR_NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-i18n-plugin/INCUBATOR_NOTICE.txt
incubator/adffaces/trunk/plugins/maven-i18n-plugin/LICENSE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-i18n-plugin/LICENSE.txt
incubator/adffaces/trunk/plugins/maven-i18n-plugin/NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-i18n-plugin/NOTICE.txt
incubator/adffaces/trunk/plugins/maven-javacc-plugin/INCUBATOR_NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-javacc-plugin/INCUBATOR_NOTICE.txt
incubator/adffaces/trunk/plugins/maven-javacc-plugin/LICENSE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-javacc-plugin/LICENSE.txt
incubator/adffaces/trunk/plugins/maven-javacc-plugin/NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-javacc-plugin/NOTICE.txt
incubator/adffaces/trunk/plugins/maven-javascript-plugin/INCUBATOR_NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-javascript-plugin/INCUBATOR_NOTICE.txt
incubator/adffaces/trunk/plugins/maven-javascript-plugin/LICENSE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-javascript-plugin/LICENSE.txt
incubator/adffaces/trunk/plugins/maven-javascript-plugin/NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-javascript-plugin/NOTICE.txt
incubator/adffaces/trunk/plugins/maven-jdev-plugin/INCUBATOR_NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-jdev-plugin/INCUBATOR_NOTICE.txt
incubator/adffaces/trunk/plugins/maven-jdev-plugin/LICENSE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-jdev-plugin/LICENSE.txt
incubator/adffaces/trunk/plugins/maven-jdev-plugin/NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-jdev-plugin/NOTICE.txt
incubator/adffaces/trunk/plugins/maven-tagdoc-plugin/INCUBATOR_NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-tagdoc-plugin/INCUBATOR_NOTICE.txt
incubator/adffaces/trunk/plugins/maven-tagdoc-plugin/LICENSE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-tagdoc-plugin/LICENSE.txt
incubator/adffaces/trunk/plugins/maven-tagdoc-plugin/NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-tagdoc-plugin/NOTICE.txt
incubator/adffaces/trunk/plugins/maven-xrts-plugin/INCUBATOR_NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-xrts-plugin/INCUBATOR_NOTICE.txt
incubator/adffaces/trunk/plugins/maven-xrts-plugin/LICENSE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-xrts-plugin/LICENSE.txt
incubator/adffaces/trunk/plugins/maven-xrts-plugin/NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/maven-xrts-plugin/NOTICE.txt
incubator/adffaces/trunk/plugins/myfaces-archetype-trinidad/INCUBATOR_NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/myfaces-archetype-trinidad/INCUBATOR_NOTICE.txt
incubator/adffaces/trunk/plugins/myfaces-archetype-trinidad/LICENSE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/myfaces-archetype-trinidad/LICENSE.txt
incubator/adffaces/trunk/plugins/myfaces-archetype-trinidad/NOTICE.txt
- copied unchanged from r496979,
incubator/adffaces/branches/matzew-m1-plugins/myfaces-archetype-trinidad/NOTICE.txt
Removed:
incubator/adffaces/trunk/plugins/maven-faces-plugin/src/main/resources/META-INF/LICENSE.txt
incubator/adffaces/trunk/plugins/maven-faces-plugin/src/main/resources/META-INF/NOTICE.txt
incubator/adffaces/trunk/plugins/maven-i18n-plugin/src/main/resources/
incubator/adffaces/trunk/plugins/maven-javacc-plugin/src/main/resources/
incubator/adffaces/trunk/plugins/maven-javascript-plugin/src/main/resources/
incubator/adffaces/trunk/plugins/maven-jdev-plugin/src/main/resources/
incubator/adffaces/trunk/plugins/maven-tagdoc-plugin/src/main/resources/
incubator/adffaces/trunk/plugins/maven-xrts-plugin/src/main/resources/
incubator/adffaces/trunk/plugins/myfaces-archetype-trinidad/src/main/resources/META-INF/LICENSE.txt
incubator/adffaces/trunk/plugins/myfaces-archetype-trinidad/src/main/resources/META-INF/NOTICE.txt
Modified:
incubator/adffaces/trunk/plugins/maven-faces-plugin/pom.xml
incubator/adffaces/trunk/plugins/maven-i18n-plugin/pom.xml
incubator/adffaces/trunk/plugins/maven-javacc-plugin/pom.xml
incubator/adffaces/trunk/plugins/maven-javacc-plugin/src/site/apt/index.apt
incubator/adffaces/trunk/plugins/maven-javascript-plugin/pom.xml
incubator/adffaces/trunk/plugins/maven-jdev-plugin/pom.xml
incubator/adffaces/trunk/plugins/maven-tagdoc-plugin/pom.xml
incubator/adffaces/trunk/plugins/maven-xrts-plugin/pom.xml
incubator/adffaces/trunk/plugins/myfaces-archetype-trinidad/pom.xml
incubator/adffaces/trunk/plugins/pom.xml
Modified: incubator/adffaces/trunk/plugins/maven-faces-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/plugins/maven-faces-plugin/pom.xml?view=diff&rev=496981&r1=496980&r2=496981
==============================================================================
--- incubator/adffaces/trunk/plugins/maven-faces-plugin/pom.xml (original)
+++ incubator/adffaces/trunk/plugins/maven-faces-plugin/pom.xml Wed Jan 17
02:10:25 2007
@@ -1,3 +1,22 @@
+<!--
+ 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>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/adffaces/trunk/plugins/maven-i18n-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/plugins/maven-i18n-plugin/pom.xml?view=diff&rev=496981&r1=496980&r2=496981
==============================================================================
--- incubator/adffaces/trunk/plugins/maven-i18n-plugin/pom.xml (original)
+++ incubator/adffaces/trunk/plugins/maven-i18n-plugin/pom.xml Wed Jan 17
02:10:25 2007
@@ -1,3 +1,22 @@
+<!--
+ 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>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/adffaces/trunk/plugins/maven-javacc-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/plugins/maven-javacc-plugin/pom.xml?view=diff&rev=496981&r1=496980&r2=496981
==============================================================================
--- incubator/adffaces/trunk/plugins/maven-javacc-plugin/pom.xml (original)
+++ incubator/adffaces/trunk/plugins/maven-javacc-plugin/pom.xml Wed Jan 17
02:10:25 2007
@@ -1,3 +1,22 @@
+<!--
+ 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>
<modelVersion>4.0.0</modelVersion>
Modified:
incubator/adffaces/trunk/plugins/maven-javacc-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/plugins/maven-javacc-plugin/src/site/apt/index.apt?view=diff&rev=496981&r1=496980&r2=496981
==============================================================================
--- incubator/adffaces/trunk/plugins/maven-javacc-plugin/src/site/apt/index.apt
(original)
+++ incubator/adffaces/trunk/plugins/maven-javacc-plugin/src/site/apt/index.apt
Wed Jan 17 02:10:25 2007
@@ -11,7 +11,7 @@
This plugin is for processing javacc files into java sources.
- http://www.javacc.org
+ https://javacc.dev.java.net
This plugin will process all *.jj files in the sourceDirectory into a
common generated sources output directory. This will occur during the
Modified: incubator/adffaces/trunk/plugins/maven-javascript-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/plugins/maven-javascript-plugin/pom.xml?view=diff&rev=496981&r1=496980&r2=496981
==============================================================================
--- incubator/adffaces/trunk/plugins/maven-javascript-plugin/pom.xml (original)
+++ incubator/adffaces/trunk/plugins/maven-javascript-plugin/pom.xml Wed Jan 17
02:10:25 2007
@@ -1,3 +1,22 @@
+<!--
+ 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>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/adffaces/trunk/plugins/maven-jdev-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/plugins/maven-jdev-plugin/pom.xml?view=diff&rev=496981&r1=496980&r2=496981
==============================================================================
--- incubator/adffaces/trunk/plugins/maven-jdev-plugin/pom.xml (original)
+++ incubator/adffaces/trunk/plugins/maven-jdev-plugin/pom.xml Wed Jan 17
02:10:25 2007
@@ -1,3 +1,22 @@
+<!--
+ 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>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/adffaces/trunk/plugins/maven-tagdoc-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/plugins/maven-tagdoc-plugin/pom.xml?view=diff&rev=496981&r1=496980&r2=496981
==============================================================================
--- incubator/adffaces/trunk/plugins/maven-tagdoc-plugin/pom.xml (original)
+++ incubator/adffaces/trunk/plugins/maven-tagdoc-plugin/pom.xml Wed Jan 17
02:10:25 2007
@@ -1,3 +1,22 @@
+<!--
+ 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>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/adffaces/trunk/plugins/maven-xrts-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/plugins/maven-xrts-plugin/pom.xml?view=diff&rev=496981&r1=496980&r2=496981
==============================================================================
--- incubator/adffaces/trunk/plugins/maven-xrts-plugin/pom.xml (original)
+++ incubator/adffaces/trunk/plugins/maven-xrts-plugin/pom.xml Wed Jan 17
02:10:25 2007
@@ -1,3 +1,22 @@
+<!--
+ 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>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/adffaces/trunk/plugins/myfaces-archetype-trinidad/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/plugins/myfaces-archetype-trinidad/pom.xml?view=diff&rev=496981&r1=496980&r2=496981
==============================================================================
--- incubator/adffaces/trunk/plugins/myfaces-archetype-trinidad/pom.xml
(original)
+++ incubator/adffaces/trunk/plugins/myfaces-archetype-trinidad/pom.xml Wed Jan
17 02:10:25 2007
@@ -1,19 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright 2002-2005 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>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/adffaces/trunk/plugins/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/plugins/pom.xml?view=diff&rev=496981&r1=496980&r2=496981
==============================================================================
--- incubator/adffaces/trunk/plugins/pom.xml (original)
+++ incubator/adffaces/trunk/plugins/pom.xml Wed Jan 17 02:10:25 2007
@@ -17,6 +17,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>3</version>
+ </parent>
+
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
<version>incubator-m1-SNAPSHOT</version>
@@ -168,9 +174,24 @@
</developer>
</developers>
- <!-- use this only for deploy to ASF servers -->
- <!--build>
- <plugins>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <!-- also include license and notice files in all the jars -->
+ <resource>
+ <directory>${basedir}/</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ <include>INCUBATOR_NOTICE.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ <!-- use this only for deploy to ASF servers -->
+ <!--plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
@@ -184,8 +205,8 @@
</execution>
</executions>
</plugin>
- </plugins>
- </build-->
+ </plugins-->
+ </build>
<scm>
<connection>
