You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2009/01/15 01:20:30 UTC
svn commit: r734576 - in
/myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha: ./ api/
api/src/main/resources/META-INF/ assembly/src/main/assembly/
assembly/src/main/resources/ assembly/src/main/resources/META-INF/
impl/src/main/resources/META-...
Author: sobryan
Date: Wed Jan 14 16:20:29 2009
New Revision: 734576
URL: http://svn.apache.org/viewvc?rev=734576&view=rev
Log:
Some comments were made about the release. This addresses those issues
* Added a plugin which will add NOTICE and LISCENCE to the generated javadoc
* Changed the NOTICE.txt files in subprojects to NOTICE to comply with Apache standards
* Deleted the liscence so the Remote Resource Plugin can pull the latest liscense from Apache
* Deleted the portlet1.0 faces config extensions
* Modified the assembly project to include the correct NOTICE and LISCENSE
Added:
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/src/main/resources/META-INF/NOTICE (contents, props changed)
- copied, changed from r734527, myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/src/main/resources/META-INF/NOTICE.txt
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/resources/META-INF/
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/resources/META-INF/NOTICE
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/impl/src/main/resources/META-INF/NOTICE (contents, props changed)
- copied, changed from r734534, myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/impl/src/main/resources/META-INF/NOTICE.txt
Removed:
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/src/main/resources/META-INF/LICENSE.txt
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/src/main/resources/META-INF/NOTICE.txt
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/src/main/resources/META-INF/portlet1.0-bridge-faces1.2-faces-config-extensions.xsd
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/resources/LICENSE.txt
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/resources/NOTICE.txt
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/impl/src/main/resources/META-INF/LICENSE.txt
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/impl/src/main/resources/META-INF/NOTICE.txt
Modified:
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/pom.xml
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/assembly/dep.xml
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/assembly/src-all.xml
myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/pom.xml
Modified: myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/pom.xml?rev=734576&r1=734575&r2=734576&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/pom.xml (original)
+++ myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/pom.xml Wed Jan 14 16:20:29 2009
@@ -71,26 +71,11 @@
<!-- Generates the Javadocs for the Website. Wagon will transport it -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
<configuration>
<doctitle>MyFaces Portlet Bridge ${project.version} API</doctitle>
<windowtitle>MyFaces Portlet Bridge ${project.version} API</windowtitle>
- <aggregate>false</aggregate>
- <linksource>true</linksource>
- <breakiterator>true</breakiterator>
- <quiet>true</quiet>
- <verbose>false</verbose>
- <source>${jdk.version}</source>
- <charset>UTF-8</charset>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
- <link>http://java.sun.com/javaee/javaserverfaces/1.2_MR1/docs/api</link>
- <!--TODO: Find a better site to lonk to-->
- <link>http://www.bluesunrise.com/portlet-api</link>
- </links>
- </configuration>
+ </configuration>
</plugin>
<!-- Allows building of jdev projects (jdev:jdev target) -->
<!-- TODO: This is an artifical dependancy on Trinidad, should it be removed? -->
Copied: myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/src/main/resources/META-INF/NOTICE (from r734527, myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/src/main/resources/META-INF/NOTICE.txt)
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/src/main/resources/META-INF/NOTICE?p2=myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/src/main/resources/META-INF/NOTICE&p1=myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/src/main/resources/META-INF/NOTICE.txt&r1=734527&r2=734576&rev=734576&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/src/main/resources/META-INF/NOTICE Wed Jan 14 16:20:29 2009
@@ -1,20 +1,19 @@
-Apache MyFaces Portlet Bridge
-Copyright [2007, 2008] The Apache Software Foundation
-
-This is an implementation of a public review specification
-developed under the Java Community Process (JCP). This
-implementation may not fully conform to this specification.
-This implementation may differ from the final specification.
-The code is not compatible with any specification of the JCP.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software are Copyright (c) 2007 Oracle
-Corporation, <http://www.oracle.com/> and are licensed to
-the Apache Software Foundation under the "Software Grant
-and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses
-associated with this software.
-
+Apache MyFaces Portlet Bridge
+Copyright [2007, 2008] The Apache Software Foundation
+
+This is an implementation of a public review specification
+developed under the Java Community Process (JCP). This
+implementation may not fully conform to this specification.
+This implementation may differ from the final specification.
+The code is not compatible with any specification of the JCP.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software are Copyright (c) 2007 Oracle
+Corporation, <http://www.oracle.com/> and are licensed to
+the Apache Software Foundation under the "Software Grant
+and Corporate Contribution License Agreement"
+
+See the LICENSE.txt file for information on all licenses
+associated with this software.
Propchange: myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/api/src/main/resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/assembly/dep.xml?rev=734576&r1=734575&r2=734576&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/assembly/dep.xml (original)
+++ myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/assembly/dep.xml Wed Jan 14 16:20:29 2009
@@ -32,7 +32,7 @@
</dependencySets>
<fileSets>
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
<outputDirectory></outputDirectory>
<includes>
<include>README*</include>
@@ -45,6 +45,7 @@
<outputDirectory>javadoc</outputDirectory>
<excludes>
<exclude>*.unpacked</exclude>
+ <exclude>**/META-INF/**</exclude>
</excludes>
</fileSet>
<fileSet>
Modified: myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/assembly/src-all.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/assembly/src-all.xml?rev=734576&r1=734575&r2=734576&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/assembly/src-all.xml (original)
+++ myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/assembly/src-all.xml Wed Jan 14 16:20:29 2009
@@ -23,21 +23,22 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <includeBaseDirectory>true</includeBaseDirectory>
+ <includeBaseDirectory>true</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <excludes>
- <exclude>org.apache.myfaces.core:myfaces-api</exclude>
- </excludes>
+ <excludes>
+ <exclude>org.apache.myfaces.core:myfaces-api</exclude>
+ </excludes>
</dependencySet>
- </dependencySets>
-
+ </dependencySets>
+
<fileSets>
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
<outputDirectory></outputDirectory>
<includes>
+ <include>README*</include>
<include>LICENSE*</include>
<include>NOTICE*</include>
</includes>
Added: myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/resources/META-INF/NOTICE?rev=734576&view=auto
==============================================================================
--- myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/resources/META-INF/NOTICE (added)
+++ myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/assembly/src/main/resources/META-INF/NOTICE Wed Jan 14 16:20:29 2009
@@ -0,0 +1,19 @@
+Apache MyFaces Portlet Bridge
+Copyright [2007, 2008] The Apache Software Foundation
+
+This is an implementation of a public review specification
+developed under the Java Community Process (JCP). This
+implementation may not fully conform to this specification.
+This implementation may differ from the final specification.
+The code is not compatible with any specification of the JCP.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software are Copyright (c) 2007 Oracle
+Corporation, <http://www.oracle.com/> and are licensed to
+the Apache Software Foundation under the "Software Grant
+and Corporate Contribution License Agreement"
+
+See the LICENSE.txt file for information on all licenses
+associated with this software.
Copied: myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/impl/src/main/resources/META-INF/NOTICE (from r734534, myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/impl/src/main/resources/META-INF/NOTICE.txt)
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/impl/src/main/resources/META-INF/NOTICE?p2=myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/impl/src/main/resources/META-INF/NOTICE&p1=myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/impl/src/main/resources/META-INF/NOTICE.txt&r1=734534&r2=734576&rev=734576&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/impl/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/impl/src/main/resources/META-INF/NOTICE Wed Jan 14 16:20:29 2009
@@ -1,20 +1,19 @@
-Apache MyFaces Portlet Bridge
-Copyright [2007, 2008] The Apache Software Foundation
-
-This is an implementation of a public review specification
-developed under the Java Community Process (JCP). This
-implementation may not fully conform to this specification.
-This implementation may differ from the final specification.
-The code is not compatible with any specification of the JCP.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software are Copyright (c) 2007 Oracle
-Corporation, <http://www.oracle.com/> and are licensed to
-the Apache Software Foundation under the "Software Grant
-and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses
-associated with this software.
-
+Apache MyFaces Portlet Bridge
+Copyright [2007, 2008] The Apache Software Foundation
+
+This is an implementation of a public review specification
+developed under the Java Community Process (JCP). This
+implementation may not fully conform to this specification.
+This implementation may differ from the final specification.
+The code is not compatible with any specification of the JCP.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software are Copyright (c) 2007 Oracle
+Corporation, <http://www.oracle.com/> and are licensed to
+the Apache Software Foundation under the "Software Grant
+and Corporate Contribution License Agreement"
+
+See the LICENSE.txt file for information on all licenses
+associated with this software.
Propchange: myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/impl/src/main/resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/pom.xml?rev=734576&r1=734575&r2=734576&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/pom.xml (original)
+++ myfaces/portlet-bridge/core/tags/portlet-bridge-2.0.0-alpha/pom.xml Wed Jan 14 16:20:29 2009
@@ -168,6 +168,7 @@
<tagBase>https://svn.apache.org/repos/asf/myfaces/portlet-bridge/core/tags</tagBase>
</configuration>
</plugin>
+
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@@ -180,6 +181,45 @@
</archive>
</configuration>
</plugin>
+
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0-alpha-6</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+ </resourceBundles>
+ <properties>
+ <addLicense>true</addLicense>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Generates the Javadocs for the Website. Wagon will transport it -->
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>false</aggregate>
+ <linksource>true</linksource>
+ <breakiterator>true</breakiterator>
+ <quiet>true</quiet>
+ <verbose>false</verbose>
+ <source>${jdk.version}</source>
+ <charset>UTF-8</charset>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ <link>http://java.sun.com/javaee/javaserverfaces/1.2_MR1/docs/api</link>
+ <link>http://www.bluesunrise.com/portlet-api</link>
+ </links>
+ </configuration>
+ </plugin>
</plugins>
</build>