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 2012/02/24 23:43:18 UTC
svn commit: r1293463 [3/3] - in /myfaces/trinidad/trunk: ./ trinidad-api/
trinidad-api/src/main/conf/META-INF/
trinidad-build/src/main/resources/META-INF/maven-faces-plugin/
trinidad-examples/trinidad-blank/src/main/webapp/
trinidad-examples/trinidad-c...
Modified: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/Global.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/Global.xml?rev=1293463&r1=1293462&r2=1293463&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/Global.xml (original)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/Global.xml Fri Feb 24 22:43:18 2012
@@ -1,4 +1,23 @@
<?xml version="1.0" ?>
+<!--
+ 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.
+
+-->
<faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
<faces-config-extension>
@@ -11,36 +30,36 @@
<fmd:description></fmd:description>
<fmd:icon></fmd:icon>
</fmd:faces-taglib>
- </fmd:faces-taglib-definitions>
- <fmd:contract-definitions>
- <fmd:contract id="org-apache-myfaces-trinidad-head-holder">
- <fmd:display-name>Apache MyFaces Trinidad HTML Head Holder</fmd:display-name>
- <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlHead</fmd:description>
- </fmd:contract>
- <fmd:contract id="org-apache-myfaces-trinidad-htmlframeborderlayout-holder">
- <fmd:display-name>Apache MyFaces Trinidad HTML Frame Border Layout Holder</fmd:display-name>
- <fmd:description>Expects component children of type org.apache.myfaces.trinidad.component.html.HtmlFrameBorderLayout</fmd:description>
- </fmd:contract>
- <fmd:contract id="org-apache-myfaces-trinidad-htmlbody-holder">
- <fmd:display-name>Apache MyFaces Trinidad HTML Body Holder</fmd:display-name>
- <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlBody</fmd:description>
- </fmd:contract>
- <fmd:contract id="org-apache-myfaces-trinidad-htmlframe-holder">
- <fmd:display-name>Apache MyFaces Trinidad HTML Frame Holder</fmd:display-name>
- <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlFrame</fmd:description>
- </fmd:contract>
- <fmd:contract id="org-apache-myfaces-trinidad-htmlrowlayout-holder">
- <fmd:display-name>Apache MyFaces Trinidad HTML Row Layout Holder</fmd:display-name>
- <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlRowLayout</fmd:description>
- </fmd:contract>
- <fmd:contract id="org-apache-myfaces-trinidad-htmlcellformat-holder">
- <fmd:display-name>Apache MyFaces Trinidad HTML Cell Format Holder</fmd:display-name>
- <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlCellFormat</fmd:description>
- </fmd:contract>
- <fmd:contract id="org-apache-myfaces-trinidad-corecolumn-holder">
- <fmd:display-name>Apache MyFaces Trinidad Core Column Holder</fmd:display-name>
- <fmd:description>Expects component children of type org.apache.myfaces.trinidad.CoreColumn</fmd:description>
- </fmd:contract>
+ </fmd:faces-taglib-definitions>
+ <fmd:contract-definitions>
+ <fmd:contract id="org-apache-myfaces-trinidad-head-holder">
+ <fmd:display-name>Apache MyFaces Trinidad HTML Head Holder</fmd:display-name>
+ <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlHead</fmd:description>
+ </fmd:contract>
+ <fmd:contract id="org-apache-myfaces-trinidad-htmlframeborderlayout-holder">
+ <fmd:display-name>Apache MyFaces Trinidad HTML Frame Border Layout Holder</fmd:display-name>
+ <fmd:description>Expects component children of type org.apache.myfaces.trinidad.component.html.HtmlFrameBorderLayout</fmd:description>
+ </fmd:contract>
+ <fmd:contract id="org-apache-myfaces-trinidad-htmlbody-holder">
+ <fmd:display-name>Apache MyFaces Trinidad HTML Body Holder</fmd:display-name>
+ <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlBody</fmd:description>
+ </fmd:contract>
+ <fmd:contract id="org-apache-myfaces-trinidad-htmlframe-holder">
+ <fmd:display-name>Apache MyFaces Trinidad HTML Frame Holder</fmd:display-name>
+ <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlFrame</fmd:description>
+ </fmd:contract>
+ <fmd:contract id="org-apache-myfaces-trinidad-htmlrowlayout-holder">
+ <fmd:display-name>Apache MyFaces Trinidad HTML Row Layout Holder</fmd:display-name>
+ <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlRowLayout</fmd:description>
+ </fmd:contract>
+ <fmd:contract id="org-apache-myfaces-trinidad-htmlcellformat-holder">
+ <fmd:display-name>Apache MyFaces Trinidad HTML Cell Format Holder</fmd:display-name>
+ <fmd:description>Expects component children of type org.apache.myfaces.trinidad.HtmlCellFormat</fmd:description>
+ </fmd:contract>
+ <fmd:contract id="org-apache-myfaces-trinidad-corecolumn-holder">
+ <fmd:display-name>Apache MyFaces Trinidad Core Column Holder</fmd:display-name>
+ <fmd:description>Expects component children of type org.apache.myfaces.trinidad.CoreColumn</fmd:description>
+ </fmd:contract>
</fmd:contract-definitions>
</fmd:global-metadata>
</faces-config-extension>
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/src/main/webapp/index.html?rev=1293463&r1=1293462&r2=1293463&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/src/main/webapp/index.html (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/src/main/webapp/index.html Fri Feb 24 22:43:18 2012
@@ -1,6 +1,24 @@
-<html>
+<!--
+ 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.
+
+-->
+<html>
<head>
<meta http-equiv="refresh" content="0; URL=faces/page1.jspx">
</head>
-</html>
\ No newline at end of file
+</html>
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/resources/log4j.properties?rev=1293463&r1=1293462&r2=1293463&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/resources/log4j.properties (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/resources/log4j.properties Fri Feb 24 22:43:18 2012
@@ -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.
+#
+
#for debugging log4j itself
log4j.debug=false
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/index.jsp?rev=1293463&r1=1293462&r2=1293463&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/index.jsp (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/index.jsp Fri Feb 24 22:43:18 2012
@@ -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.
+
+-->
<%@ page contentType="text/html" %>
<%@ page pageEncoding="UTF-8" %>
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/resources/index.html
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/resources/index.html?rev=1293463&r1=1293462&r2=1293463&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/resources/index.html (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/resources/index.html Fri Feb 24 22:43:18 2012
@@ -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.
+
+-->
<html>
<header>
<meta http-equiv="Refresh" content="0;url=/faces/pages/demoStart.xhtml">
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/pom.xml?rev=1293463&r1=1293462&r2=1293463&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/pom.xml Fri Feb 24 22:43:18 2012
@@ -112,6 +112,17 @@
</libraries>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/Nasdaq*.txt</exclude>
+ <exclude>**/*.jspf</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/conf/trinidad-email-demo.properties.sample
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/conf/trinidad-email-demo.properties.sample?rev=1293463&r1=1293462&r2=1293463&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/conf/trinidad-email-demo.properties.sample (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/conf/trinidad-email-demo.properties.sample Fri Feb 24 22:43:18 2012
@@ -1,3 +1,21 @@
+#
+# 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.
+#
username=adam.winer
domain=oracle.com
server=rgmamerimap.oraclecorp.com
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml?rev=1293463&r1=1293462&r2=1293463&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml Fri Feb 24 22:43:18 2012
@@ -16,7 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<trinidad-config xmlns="http://myfaces.apache.org/trinidad/config">
<!--debug-output>true</debug-output-->
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/demos/CustomPortletStyles.css
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/demos/CustomPortletStyles.css?rev=1293463&r1=1293462&r2=1293463&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/demos/CustomPortletStyles.css (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/demos/CustomPortletStyles.css Fri Feb 24 22:43:18 2012
@@ -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.
+ */
+
/** Table portlet styles */
.portlet-table-header {
border-color:#999999;
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/test/webapp/WEB-INF/trinidad-config.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/test/webapp/WEB-INF/trinidad-config.xml?rev=1293463&r1=1293462&r2=1293463&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/test/webapp/WEB-INF/trinidad-config.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/test/webapp/WEB-INF/trinidad-config.xml Fri Feb 24 22:43:18 2012
@@ -1,6 +1,25 @@
<?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.
+
+-->
<trinidad-config xmlns="http://myfaces.apache.org/trinidad/config">
<skin-family>minimal</skin-family>
-</trinidad-config>
\ No newline at end of file
+</trinidad-config>
Modified: myfaces/trinidad/trunk/trinidad-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/pom.xml?rev=1293463&r1=1293462&r2=1293463&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/pom.xml Fri Feb 24 22:43:18 2012
@@ -187,6 +187,7 @@
</testSourceRoots>
</configuration>
</plugin>
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -298,6 +299,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-faces-plugin</artifactId>
@@ -327,6 +329,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-i18n-plugin</artifactId>
@@ -343,6 +346,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-javascript-plugin</artifactId>
@@ -360,6 +364,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-xrts-plugin</artifactId>
@@ -372,6 +377,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
@@ -391,6 +397,20 @@
</reportPlugins>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- Excludes the Golden files -->
+ <exclude>src/test/resources/*/</exclude>
+ <exclude>src/main/resources/META-INF/trinidad-version.txt</exclude>
+ <exclude>src/main/resources/META-INF/servlets/resources/adf.resources</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
</project>