Author: nbelaevski
Date: 2011-03-31 11:27:03 -0400 (Thu, 31 Mar 2011)
New Revision: 22345
Added:
trunk/examples/richfaces-showcase/src/main/java-gae/
trunk/examples/richfaces-showcase/src/main/java-gae/com/
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/facelets/
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/facelets/impl/
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/facelets/impl/IdMapper.java
Removed:
trunk/examples/richfaces-showcase/src/main/java-gae/com/
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/facelets/
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/facelets/impl/
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/facelets/impl/IdMapper.java
Modified:
trunk/examples/richfaces-showcase/pom.xml
trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/appengine-web.xml
Log:
https://issues.jboss.org/browse/RF-10823
https://issues.jboss.org/browse/RF-10828
Modified: trunk/examples/richfaces-showcase/pom.xml
===================================================================
--- trunk/examples/richfaces-showcase/pom.xml 2011-03-31 15:26:32 UTC (rev 22344)
+++ trunk/examples/richfaces-showcase/pom.xml 2011-03-31 15:27:03 UTC (rev 22345)
@@ -193,6 +193,24 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/main/java-gae</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
Deleted:
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/facelets/impl/IdMapper.java
===================================================================
---
branches/4.0.X/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/facelets/impl/IdMapper.java 2011-03-30
15:21:27 UTC (rev 22338)
+++
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/facelets/impl/IdMapper.java 2011-03-31
15:27:03 UTC (rev 22345)
@@ -1,102 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").
You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at
https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- *
- * Contributor(s):
- *
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license." If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above. However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- * Copyright 2005-2007 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.
- */
-
-
-package com.sun.faces.facelets.impl;
-
-import javax.faces.context.FacesContext;
-
-import com.sun.faces.util.Util;
-
-/**
- * Used to provide aliases to Facelets generated unique IDs with tend to be
- * womewhat long.
- */
-public class IdMapper {
-
- private static final String KEY = IdMapper.class.getName();
-
- // ------------------------------------------------------------ Constructors
-
-
- IdMapper() { }
-
-
- // ---------------------------------------------------------- Public Methods
-
-
- public String getAliasedId(String id) {
- return "R" + id;
- }
-
-
- public static void setMapper(FacesContext ctx, IdMapper mapper) {
-
- Util.notNull("ctx", ctx);
- if (mapper == null) {
- ctx.getAttributes().remove(KEY);
- } else {
- ctx.getAttributes().put(KEY, mapper);
- }
-
- }
-
-
- public static IdMapper getMapper(FacesContext ctx) {
-
- Util.notNull("ctx", ctx);
- return ((IdMapper) ctx.getAttributes().get(KEY));
-
- }
-}
Copied:
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/facelets/impl/IdMapper.java
(from rev 22338,
branches/4.0.X/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/facelets/impl/IdMapper.java)
===================================================================
---
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/facelets/impl/IdMapper.java
(rev 0)
+++
trunk/examples/richfaces-showcase/src/main/java-gae/com/sun/faces/facelets/impl/IdMapper.java 2011-03-31
15:27:03 UTC (rev 22345)
@@ -0,0 +1,102 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").
You
+ * may not use this file except in compliance with the License. You can obtain
+ * a copy of the License at
https://glassfish.dev.java.net/public/CDDL+GPL.html
+ * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+ * Sun designates this particular file as subject to the "Classpath" exception
+ * as provided by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the License
+ * Header, with the fields enclosed by brackets [] replaced by your own
+ * identifying information: "Portions Copyrighted [year]
+ * [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ *
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ * Copyright 2005-2007 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.
+ */
+
+
+package com.sun.faces.facelets.impl;
+
+import javax.faces.context.FacesContext;
+
+import com.sun.faces.util.Util;
+
+/**
+ * Used to provide aliases to Facelets generated unique IDs with tend to be
+ * womewhat long.
+ */
+public class IdMapper {
+
+ private static final String KEY = IdMapper.class.getName();
+
+ // ------------------------------------------------------------ Constructors
+
+
+ IdMapper() { }
+
+
+ // ---------------------------------------------------------- Public Methods
+
+
+ public String getAliasedId(String id) {
+ return "R" + id;
+ }
+
+
+ public static void setMapper(FacesContext ctx, IdMapper mapper) {
+
+ Util.notNull("ctx", ctx);
+ if (mapper == null) {
+ ctx.getAttributes().remove(KEY);
+ } else {
+ ctx.getAttributes().put(KEY, mapper);
+ }
+
+ }
+
+
+ public static IdMapper getMapper(FacesContext ctx) {
+
+ Util.notNull("ctx", ctx);
+ return ((IdMapper) ctx.getAttributes().get(KEY));
+
+ }
+}
Modified: trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/appengine-web.xml
===================================================================
---
trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/appengine-web.xml 2011-03-31
15:26:32 UTC (rev 22344)
+++
trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/appengine-web.xml 2011-03-31
15:27:03 UTC (rev 22345)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<appengine-web-app
xmlns="http://appengine.google.com/ns/1.0">
<application>travelcurve</application>
- <version>28</version>
+ <version>42</version>
<sessions-enabled>true</sessions-enabled>
<system-properties>