You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/11/06 16:02:22 UTC
svn commit: r471756 [30/31] - in /struts/struts2/trunk: apps/blank/
apps/blank/src/main/java/example/ apps/blank/src/test/java/example/
apps/mailreader/src/main/java/mailreader2/
apps/portlet/src/main/java/org/apache/struts2/portlet/example/ apps/portl...
Modified: struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java (original)
+++ struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.views.jasperreports;
Modified: struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java (original)
+++ struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 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.
*/
package org.apache.struts2.views.jasperreports;
@@ -90,7 +93,7 @@
*
* <p>
* This result follows the same rules from {@link StrutsResultSupport}.
- * Specifically, all parameters will be parsed if the "parse" parameter is not
+ * Specifically, all parameters will be parsed if the "parse" parameter is not
* set to false.
* </p>
* <!-- END SNIPPET: params -->
@@ -114,11 +117,11 @@
*
*/
public class JasperReportsResult extends StrutsResultSupport implements JasperReportConstants {
-
- private static final long serialVersionUID = -2523174799621182907L;
+
+ private static final long serialVersionUID = -2523174799621182907L;
- private final static Log LOG = LogFactory.getLog(JasperReportsResult.class);
+ private final static Log LOG = LogFactory.getLog(JasperReportsResult.class);
protected String dataSource;
@@ -126,16 +129,16 @@
protected String documentName;
protected String contentDisposition;
protected String delimiter;
- protected String imageServletUrl = "/images/";
-
+ protected String imageServletUrl = "/images/";
+
public JasperReportsResult() {
- super();
+ super();
}
-
+
public JasperReportsResult(String location) {
- super(location);
+ super(location);
}
-
+
public String getImageServletUrl() {
return imageServletUrl;
}
@@ -266,7 +269,7 @@
response.setContentType("text/html");
// IMAGES_MAPS seems to be only supported as "backward compatible" from JasperReports 1.1.0
-
+
Map imagesMap = new HashMap();
request.getSession(true).setAttribute("IMAGES_MAP", imagesMap);
Modified: struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java (original)
+++ struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.views.jasperreports;
Modified: struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackShadowMap.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackShadowMap.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackShadowMap.java (original)
+++ struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackShadowMap.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.views.jasperreports;
@@ -29,9 +32,9 @@
*/
public class ValueStackShadowMap extends HashMap {
- private static final long serialVersionUID = -167109778490907240L;
+ private static final long serialVersionUID = -167109778490907240L;
- /**
+ /**
* valueStack reference
*/
ValueStack valueStack;
Modified: struts/struts2/trunk/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java (original)
+++ struts/struts2/trunk/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.dispatcher;
@@ -35,21 +38,21 @@
*/
public class ChartResult implements Result {
- private static final long serialVersionUID = -6484761870055986612L;
-
- JFreeChart chart;
+ private static final long serialVersionUID = -6484761870055986612L;
+
+ JFreeChart chart;
boolean chartSet = false;
private int height;
private int width;
public ChartResult() {
- super();
+ super();
}
-
+
public ChartResult(JFreeChart chart, int height, int width) {
- setChart(chart);
- this.height = height;
- this.width = width;
+ setChart(chart);
+ this.height = height;
+ this.width = width;
}
/**
Modified: struts/struts2/trunk/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java (original)
+++ struts/struts2/trunk/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.dispatcher;
Modified: struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java (original)
+++ struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.jsf;
@@ -30,7 +33,7 @@
/**
* Apply Request Values (JSF.2.2.2)
- *
+ *
* @param viewId
* The view id
* @param facesContext
Modified: struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java (original)
+++ struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.jsf;
@@ -39,7 +42,7 @@
/**
* Adapts the phase workflow to Action 2
- *
+ *
* @param invocation
* The action invocation
* @return The string result code
@@ -76,7 +79,7 @@
/**
* Executes the specific phase. The phase id is constructed as a composite
* of the namespace and action name.
- *
+ *
* @param viewId
* The view id
* @param facesContext
@@ -95,7 +98,7 @@
/**
* Determines whether to process this request with the JSF phases
- *
+ *
* @param ctx The current action context
* @return True if it is a faces-enabled request
*/
Modified: struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesRender.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesRender.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesRender.java (original)
+++ struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesRender.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.jsf;
@@ -31,9 +34,9 @@
*/
public class FacesRender extends FacesSupport {
- /**
+ /**
* Executes the render phase, borrowed from MyFaces
- *
+ *
* @param facesContext
* The faces context
* @throws FacesException
Modified: struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java (original)
+++ struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.jsf;
@@ -34,17 +37,17 @@
private static final long serialVersionUID = -3548970638740937804L;
public FacesResult() {
- super();
+ super();
}
-
+
public FacesResult(String location) {
- super(location);
+ super(location);
}
/**
* Checks to see if we need to build a new JSF ViewId from the Struts Result
* config and then renders the result by delegating to the
* FacesRender.render().
- *
+ *
* @see org.apache.struts2.dispatcher.StrutsResultSupport#doExecute(java.lang.String,
* com.opensymphony.
*/
@@ -57,7 +60,7 @@
/**
* Compares the Struts Result uri to the faces viewId. If they are different
* use the Struts uri to build a new faces viewId.
- *
+ *
* @param finalLocation
* The result uri
* @param facesContext
Modified: struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java (original)
+++ struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.jsf;
@@ -57,7 +60,7 @@
* <p>
* </p>
* <b>Example struts.xml configuration:</b>
- *
+ *
* <pre>
* <interceptor-ref name="jsfSetup">
* <param name="actionListener"></param>
@@ -75,7 +78,7 @@
* <param name="viewHandler;">org.apache.shale.tiles.TilesViewHandler</param>
* </interceptor-ref>
* </pre>
- *
+ *
* <p>
* </p>
* <b>Note: None of the parameters are required but all are shown in the example
@@ -114,7 +117,7 @@
/**
* Sets the lifecycle id
- *
+ *
* @param id
* The id
*/
@@ -204,7 +207,7 @@
/**
* Creates the faces context for other phases.
- *
+ *
* @param invocation
* The action invocation
*/
@@ -247,7 +250,7 @@
/**
* Determines if this action mapping will be have a JSF view
- *
+ *
* @param inv
* The action invocation
* @return True if the JSF interceptors should fire
@@ -278,7 +281,7 @@
* creating the objects using constructor delegation, if the requested class
* supports it. Classes will be imbedded from top to bottom in the list with
* the last class listed being the one that will be returned.
- *
+ *
* @param interfaceClass
* The Class type that is expected to be returned
* @param classNamesIterator
@@ -363,7 +366,7 @@
* Takes a comma delimited string of class names and stores the names in an
* <code>ArrayList</code>. The incoming <code>String</code> will be
* cleaned of any whitespace characters before the class names are stored.
- *
+ *
* @param actionListener
* A comma delimited string of class names
*/
@@ -383,7 +386,7 @@
* A <code>String</code> to be used as the defaultRenderKitId for the jsf
* application. The incoming <code>String</code> will be cleaned of
* whitespace characters.
- *
+ *
* @param defaultRenderKitId
* The defaultRenderKitId
*/
@@ -396,7 +399,7 @@
* Takes a comma delimited string of local names and stores the names in an
* <code>ArrayList</code>. The incoming <code>String</code> will be
* cleaned of any whitespace characters before the class names are stored.
- *
+ *
* @param supportedLocale
* A comma delimited string of local names
*/
@@ -416,7 +419,7 @@
* Stores a String representation of the defaultLocale. The incoming
* <code>String</code> will be cleaned of any whitespace characters before
* the class names are stored.
- *
+ *
* @param defaultLocale
* The default local
*/
@@ -427,7 +430,7 @@
/**
* Stores the messageBundle to be used to configure the jsf Application.
- *
+ *
* @param messageBundle
* The messageBundle
*/
@@ -440,7 +443,7 @@
* Takes a comma delimited string of class names and stores the names in an
* <code>ArrayList</code>. The incoming <code>String</code> will be
* cleaned of any whitespace characters before the class names are stored.
- *
+ *
* @param navigationHandlerName
* A comma delimited string of class names
*/
@@ -460,7 +463,7 @@
* Takes a comma delimited string of class names and stores the names in an
* <code>ArrayList</code>. The incoming <code>String</code> will be
* cleaned of any whitespace characters before the class names are stored.
- *
+ *
* @param propertyResolverName
* A comma delimited string of class names
*/
@@ -480,7 +483,7 @@
* Takes a comma delimited string of class names and stores the names in an
* <code>ArrayList</code>. The incoming <code>String</code> will be
* cleaned of any whitespace characters before the class names are stored.
- *
+ *
* @param stateManagerName
* A comma delimited string of class names
*/
@@ -500,7 +503,7 @@
* Takes a comma delimited string of class names and stores the names in an
* <code>ArrayList</code>. The incoming <code>String</code> will be
* cleaned of any whitespace characters before the class names are stored.
- *
+ *
* @param variableResolverName
* A comma delimited string of class names
*/
@@ -520,7 +523,7 @@
* Takes a comma delimited string of class names and stores the names in an
* <code>ArrayList</code>. The incoming <code>String</code> will be
* cleaned of any whitespace characters before the class names are stored.
- *
+ *
* @param viewHandlerName
* A comma delimited string of class names
*/
@@ -539,7 +542,7 @@
/**
* Converts a locale string to <code>Locale</code> class. Accepts both '_'
* and '-' as separators for locale components.
- *
+ *
* @param localeString
* string representation of a locale
* @return Locale instance, compatible with the string representation
Modified: struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java (original)
+++ struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.jsf;
@@ -33,10 +36,10 @@
*/
public class FacesSupport {
- private static final String LIFECYCLE_KEY = "lifecycle";
+ private static final String LIFECYCLE_KEY = "lifecycle";
- /** Log instance for each class */
- protected Log log;
+ /** Log instance for each class */
+ protected Log log;
/**
* Marker key for the ActionContext to dictate whether to treat the request
@@ -49,122 +52,122 @@
log = LogFactory.getLog(getClass());
}
- /**
- * Gets the shared lifecycle for this request
- *
- * @return The lifecycle
- */
- private Lifecycle getLifecycle() {
- return (Lifecycle) ActionContext.getContext().get(LIFECYCLE_KEY);
- }
-
- /**
- * Sets the lifecycle for this request
- *
- * @param lifecycle
- * The lifecycle
- */
- protected void setLifecycle(Lifecycle lifecycle) {
- ActionContext.getContext().put(LIFECYCLE_KEY, lifecycle);
- }
-
- /**
- * Informs phase listeners before a phase is executed
- *
- * @param facesContext
- * The current faces context
- * @param phaseId
- * The phase id about to be executed
- */
- protected void informPhaseListenersBefore(FacesContext facesContext,
- PhaseId phaseId) {
- Lifecycle lifecycle = getLifecycle();
- PhaseListener[] phaseListeners = lifecycle.getPhaseListeners();
- for (int i = 0; i < phaseListeners.length; i++) {
- PhaseListener phaseListener = phaseListeners[i];
- int listenerPhaseId = phaseListener.getPhaseId().getOrdinal();
- if (listenerPhaseId == PhaseId.ANY_PHASE.getOrdinal()
- || listenerPhaseId == phaseId.getOrdinal()) {
- phaseListener.beforePhase(new PhaseEvent(FacesContext
- .getCurrentInstance(), phaseId, lifecycle));
- }
- }
-
- }
-
- /**
- * Informs phase listeners after a phase is executed
- *
- * @param facesContext
- * The current faces context
- * @param phaseId
- * The phase id that was executed
- */
- protected void informPhaseListenersAfter(FacesContext facesContext,
- PhaseId phaseId) {
- Lifecycle lifecycle = getLifecycle();
- PhaseListener[] phaseListeners = lifecycle.getPhaseListeners();
- for (int i = 0; i < phaseListeners.length; i++) {
- PhaseListener phaseListener = phaseListeners[i];
- int listenerPhaseId = phaseListener.getPhaseId().getOrdinal();
- if (listenerPhaseId == PhaseId.ANY_PHASE.getOrdinal()
- || listenerPhaseId == phaseId.getOrdinal()) {
- phaseListener.afterPhase(new PhaseEvent(FacesContext
- .getCurrentInstance(), phaseId, lifecycle));
- }
- }
-
- }
-
- /**
- * Checks to see if the response has been completed. Mainly used for better
- * debugging messages.
- *
- * @param facesContext
- * The current faces context
- * @param phase
- * The phase id in execution
- * @param before
- * Whether the phase has been executed or not
- * @return True if the response is complete
- */
- protected boolean isResponseComplete(FacesContext facesContext,
- String phase, boolean before) {
- boolean flag = false;
- if (facesContext.getResponseComplete()) {
- if (log.isDebugEnabled())
- log
- .debug("exiting from lifecycle.execute in "
- + phase
- + " because getResponseComplete is true from one of the "
- + (before ? "before" : "after") + " listeners");
- flag = true;
- }
- return flag;
- }
-
- /**
- * Checks to see the render phase should be executed next. Mainly used for
- * better debugging messages.
- *
- * @param facesContext
- * The current faces context
- * @param phase
- * The phase id in execution
- * @param before
- * Whether the phase has been executed or not
- * @return True if the response is complete
- */
- protected boolean shouldRenderResponse(FacesContext facesContext,
- String phase, boolean before) {
- boolean flag = false;
- if (facesContext.getRenderResponse()) {
- if (log.isDebugEnabled())
- log.debug("exiting from lifecycle.execute in " + phase
- + " because getRenderResponse is true from one of the "
- + (before ? "before" : "after") + " listeners");
- flag = true;
- }
- return flag;
- }
+ /**
+ * Gets the shared lifecycle for this request
+ *
+ * @return The lifecycle
+ */
+ private Lifecycle getLifecycle() {
+ return (Lifecycle) ActionContext.getContext().get(LIFECYCLE_KEY);
+ }
+
+ /**
+ * Sets the lifecycle for this request
+ *
+ * @param lifecycle
+ * The lifecycle
+ */
+ protected void setLifecycle(Lifecycle lifecycle) {
+ ActionContext.getContext().put(LIFECYCLE_KEY, lifecycle);
+ }
+
+ /**
+ * Informs phase listeners before a phase is executed
+ *
+ * @param facesContext
+ * The current faces context
+ * @param phaseId
+ * The phase id about to be executed
+ */
+ protected void informPhaseListenersBefore(FacesContext facesContext,
+ PhaseId phaseId) {
+ Lifecycle lifecycle = getLifecycle();
+ PhaseListener[] phaseListeners = lifecycle.getPhaseListeners();
+ for (int i = 0; i < phaseListeners.length; i++) {
+ PhaseListener phaseListener = phaseListeners[i];
+ int listenerPhaseId = phaseListener.getPhaseId().getOrdinal();
+ if (listenerPhaseId == PhaseId.ANY_PHASE.getOrdinal()
+ || listenerPhaseId == phaseId.getOrdinal()) {
+ phaseListener.beforePhase(new PhaseEvent(FacesContext
+ .getCurrentInstance(), phaseId, lifecycle));
+ }
+ }
+
+ }
+
+ /**
+ * Informs phase listeners after a phase is executed
+ *
+ * @param facesContext
+ * The current faces context
+ * @param phaseId
+ * The phase id that was executed
+ */
+ protected void informPhaseListenersAfter(FacesContext facesContext,
+ PhaseId phaseId) {
+ Lifecycle lifecycle = getLifecycle();
+ PhaseListener[] phaseListeners = lifecycle.getPhaseListeners();
+ for (int i = 0; i < phaseListeners.length; i++) {
+ PhaseListener phaseListener = phaseListeners[i];
+ int listenerPhaseId = phaseListener.getPhaseId().getOrdinal();
+ if (listenerPhaseId == PhaseId.ANY_PHASE.getOrdinal()
+ || listenerPhaseId == phaseId.getOrdinal()) {
+ phaseListener.afterPhase(new PhaseEvent(FacesContext
+ .getCurrentInstance(), phaseId, lifecycle));
+ }
+ }
+
+ }
+
+ /**
+ * Checks to see if the response has been completed. Mainly used for better
+ * debugging messages.
+ *
+ * @param facesContext
+ * The current faces context
+ * @param phase
+ * The phase id in execution
+ * @param before
+ * Whether the phase has been executed or not
+ * @return True if the response is complete
+ */
+ protected boolean isResponseComplete(FacesContext facesContext,
+ String phase, boolean before) {
+ boolean flag = false;
+ if (facesContext.getResponseComplete()) {
+ if (log.isDebugEnabled())
+ log
+ .debug("exiting from lifecycle.execute in "
+ + phase
+ + " because getResponseComplete is true from one of the "
+ + (before ? "before" : "after") + " listeners");
+ flag = true;
+ }
+ return flag;
+ }
+
+ /**
+ * Checks to see the render phase should be executed next. Mainly used for
+ * better debugging messages.
+ *
+ * @param facesContext
+ * The current faces context
+ * @param phase
+ * The phase id in execution
+ * @param before
+ * Whether the phase has been executed or not
+ * @return True if the response is complete
+ */
+ protected boolean shouldRenderResponse(FacesContext facesContext,
+ String phase, boolean before) {
+ boolean flag = false;
+ if (facesContext.getRenderResponse()) {
+ if (log.isDebugEnabled())
+ log.debug("exiting from lifecycle.execute in " + phase
+ + " because getRenderResponse is true from one of the "
+ + (before ? "before" : "after") + " listeners");
+ flag = true;
+ }
+ return flag;
+ }
}
Modified: struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java (original)
+++ struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.jsf;
@@ -30,7 +33,7 @@
/**
* Invoke Application (JSF.2.2.5)
- *
+ *
* @param viewId
* The view id
* @param facesContext
Modified: struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java (original)
+++ struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.jsf;
@@ -26,49 +29,49 @@
*/
public class ProcessValidationsInterceptor extends FacesInterceptor {
- private static final long serialVersionUID = 8785236570688278147L;
+ private static final long serialVersionUID = 8785236570688278147L;
- /**
- * Process Validations (JSF.2.2.3)
- *
- * @param viewId
- * The view id
- * @param facesContext
- * The faces context
- * @return true, if response is complete
- */
- protected boolean executePhase(String viewId, FacesContext facesContext)
- throws FacesException {
- boolean skipFurtherProcessing = false;
- if (log.isTraceEnabled())
- log.trace("entering processValidations");
+ /**
+ * Process Validations (JSF.2.2.3)
+ *
+ * @param viewId
+ * The view id
+ * @param facesContext
+ * The faces context
+ * @return true, if response is complete
+ */
+ protected boolean executePhase(String viewId, FacesContext facesContext)
+ throws FacesException {
+ boolean skipFurtherProcessing = false;
+ if (log.isTraceEnabled())
+ log.trace("entering processValidations");
- informPhaseListenersBefore(facesContext, PhaseId.PROCESS_VALIDATIONS);
+ informPhaseListenersBefore(facesContext, PhaseId.PROCESS_VALIDATIONS);
try {
- if (isResponseComplete(facesContext, "processValidations", true)) {
- // have to return right away
- return true;
- }
- if (shouldRenderResponse(facesContext, "processValidations", true)) {
- skipFurtherProcessing = true;
- }
-
- facesContext.getViewRoot().processValidators(facesContext);
+ if (isResponseComplete(facesContext, "processValidations", true)) {
+ // have to return right away
+ return true;
+ }
+ if (shouldRenderResponse(facesContext, "processValidations", true)) {
+ skipFurtherProcessing = true;
+ }
+
+ facesContext.getViewRoot().processValidators(facesContext);
} finally {
informPhaseListenersAfter(facesContext, PhaseId.PROCESS_VALIDATIONS);
}
- if (isResponseComplete(facesContext, "processValidations", false)
- || shouldRenderResponse(facesContext, "processValidations",
- false)) {
- // since this phase is completed we don't need to return right away
- // even if the response is completed
- skipFurtherProcessing = true;
- }
-
- if (!skipFurtherProcessing && log.isTraceEnabled())
- log.trace("exiting processValidations");
- return skipFurtherProcessing;
- }
+ if (isResponseComplete(facesContext, "processValidations", false)
+ || shouldRenderResponse(facesContext, "processValidations",
+ false)) {
+ // since this phase is completed we don't need to return right away
+ // even if the response is completed
+ skipFurtherProcessing = true;
+ }
+
+ if (!skipFurtherProcessing && log.isTraceEnabled())
+ log.trace("exiting processValidations");
+ return skipFurtherProcessing;
+ }
}
Modified: struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java (original)
+++ struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.jsf;
@@ -41,7 +44,7 @@
/**
* Restore View (JSF.2.2.1)
- *
+ *
* @param viewId
* The view id
* @param facesContext
@@ -115,7 +118,7 @@
* the ValueBinding next time it needs to. I expect this to cause
* more similar bugs. TODO : Completely remove or be SURE by default
* it's not executed, and it has no more side-effects.
- *
+ *
* if (log.isTraceEnabled()) { //Note: DebugUtils Logger must also
* be in trace level DebugUtils.traceView(viewCreated ? "Newly
* created view" : "Restored view"); }
@@ -200,7 +203,7 @@
/**
* This is all a hack to work around a spec-bug which will be fixed in
* JSF2.0
- *
+ *
* @param parent
* @return true if this component is bindingAware (e.g. aliasBean)
*/
Modified: struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java (original)
+++ struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.jsf;
@@ -32,30 +35,30 @@
* NavigationHandler is called.
*/
public class StrutsNavigationHandler extends NavigationHandler {
-
+
private NavigationHandler parent;
-
+
/**
* Creates the handler
- *
+ *
* @param handler The old NavigationHandler to possibly delegate to
*/
public StrutsNavigationHandler(NavigationHandler handler) {
this.parent = handler;
}
- /**
- * Stores any outcomes as the result code, failing over to the old
+ /**
+ * Stores any outcomes as the result code, failing over to the old
* NavigationHandler
- *
- * @param facesContext The faces context
- * @param fromAction The action we are coming from
- * @param outcome The String return code
- */
- @Override
- public void handleNavigation(FacesContext facesContext, String fromAction, String outcome) {
- ActionContext ctx = ActionContext.getContext();
- if (outcome != null) {
+ *
+ * @param facesContext The faces context
+ * @param fromAction The action we are coming from
+ * @param outcome The String return code
+ */
+ @Override
+ public void handleNavigation(FacesContext facesContext, String fromAction, String outcome) {
+ ActionContext ctx = ActionContext.getContext();
+ if (outcome != null) {
ActionConfig config = ctx.getActionInvocation().getProxy().getConfig();
Map results = config.getResults();
@@ -77,7 +80,7 @@
// Failing over to parent handler
parent.handleNavigation(facesContext, fromAction, outcome);
}
- }
- }
+ }
+ }
}
Modified: struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java (original)
+++ struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.jsf;
@@ -39,7 +42,7 @@
/**
* Constructor
- *
+ *
* @param original
* Original resolver to delegate to.
*/
@@ -56,7 +59,7 @@
* name from the value stack. Otherwise it will delegate to the original jsf
* resolver.
* </p>
- *
+ *
* @param name
* Variable name to be resolved
*/
@@ -66,7 +69,7 @@
if (STRUTS_VARIABLE_NAME.equals(name)) {
return ActionContext.getContext().getActionInvocation().getAction();
}
-
+
Object obj = ActionContext.getContext().getValueStack().findValue(name);
if (obj != null) {
return obj;
Modified: struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java (original)
+++ struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.jsf;
@@ -30,7 +33,7 @@
/**
* Update Model Values (JSF.2.2.4)
- *
+ *
* @param viewId
* The view id
* @param facesContext
Modified: struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java (original)
+++ struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.dispatcher.multipart;
Modified: struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java (original)
+++ struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.plexus;
Modified: struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java (original)
+++ struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.plexus;
Modified: struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java (original)
+++ struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.plexus;
@@ -259,7 +262,7 @@
/**
* Looks up an object
- *
+ *
* @param role The role name
* @param extraContext The extra context
* @return The object
@@ -272,7 +275,7 @@
/**
* Looks up an object
- *
+ *
* @param role The role name
* @param roleHint The role hint
* @param extraContext The extra context
Modified: struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusThreadLocal.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusThreadLocal.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusThreadLocal.java (original)
+++ struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusThreadLocal.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.plexus;
Modified: struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java (original)
+++ struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.plexus;
@@ -34,7 +37,7 @@
/**
* Configures the container with the configuration file
- *
+ *
* @param pc The plexus container
* @param file The file path
* @throws PlexusConfigurationResourceException If the plexus configuration can't be loaded
Modified: struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/Main.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/Main.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/Main.java (original)
+++ struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/Main.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2;
Modified: struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/Configuration.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/Configuration.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/Configuration.java (original)
+++ struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/Configuration.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.quickstart;
@@ -42,9 +45,9 @@
*/
public class Configuration implements Serializable {
- private static final long serialVersionUID = 9159115401614443449L;
+ private static final long serialVersionUID = 9159115401614443449L;
- String ideaConfig;
+ String ideaConfig;
String extendsConfig;
String resolver;
Integer port;
Modified: struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/JettyServer.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/JettyServer.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/JettyServer.java (original)
+++ struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/JettyServer.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.quickstart;
Modified: struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/Mapping.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/Mapping.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/Mapping.java (original)
+++ struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/Mapping.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.quickstart;
Modified: struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/MultiDirClassLoader.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/MultiDirClassLoader.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/MultiDirClassLoader.java (original)
+++ struts/struts2/trunk/plugins/quickstart/src/main/java/org/apache/struts2/quickstart/MultiDirClassLoader.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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 org.apache.struts2.quickstart;