[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Geronimo Development (GMOxDEV) http://cwiki.apache.org/confluence/display/GMOxDEV | |-Pages Added or Edited in This Space |-- Integration Testing was last edited by pkashyap (03:31 PM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Integration+Testing |-- Building Apache Geronimo with Maven 2 was last edited by caboteria (08:36 AM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Building+Apache+Geronimo+with+Maven+2 Apache CXF 2.0 Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- Celtix Migration Guide was created by dandiep (11:59 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Celtix+Migration+Guide |-- Index was last edited by dandiep (11:31 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Index |-- XFire Migration Guide was last edited by dandiep (11:28 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/XFire+Migration+Guide |-- Navigation was last edited by dandiep (11:09 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Navigation Apache Directory Server v1.1 Documentation (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- LdapStudio was last edited by pamarcelot (03:33 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/LdapStudio Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid | |-Pages Added or Edited in This Space |-- 3rd Party Libraries was created by mmccorma (04:34 AM). | http://cwiki.apache.org/confluence/display/qpid/3rd+Party+Libraries Apache Geronimo v1.1 (GMOxDOC11) http://cwiki.apache.org/confluence/display/GMOxDOC11 | |-Pages Added or Edited in This Space |-- Quick start - Apache Geronimo for the impatient was last edited by hcunico (08:50 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/Quick+start+-+Apache+Geronimo+for+the+impatient |-- openejb-jar.xml was last edited by [EMAIL PROTECTED] (05:09 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/openejb-jar.xml Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- SiteMesh Plugin was last edited by [EMAIL PROTECTED] (05:39 PM). | http://cwiki.apache.org/confluence/display/WW/SiteMesh+Plugin |-- Annotations was last edited by husted (12:24 PM). | http://cwiki.apache.org/confluence/display/WW/Annotations |-- Contributors Guide was last edited by husted (09:49 AM). | http://cwiki.apache.org/confluence/display/WW/Contributors+Guide |-- Codebehind Plugin was last edited by husted (09:24 AM). | http://cwiki.apache.org/confluence/display/WW/Codebehind+Plugin |-- Precise Error Reporting was created by husted (09:20 AM). | http://cwiki.apache.org/confluence/display/WW/Precise+Error+Reporting |-- Release Notes 2.0.2 was last edited by husted (09:21 AM). | http://cwiki.apache.org/confluence/display/WW/Release+Notes+2.0.2 |-- Bean Configuration was last edited by husted (06:11 AM). | http://cwiki.apache.org/confluence/display/WW/Bean+Configuration |-- Localization was last edited by husted (06:09 AM). | http://cwiki.apache.org/confluence/display/WW/Localization |-- Plugin Guide was last edited by husted (06:09 AM). | http://cwiki.apache.org/confluence/display/WW/Plugin+Guide |-- Architecture was last edited by husted (06:09 AM). | http://cwiki.apache.org/confluence/display/WW/Architecture |-- Dependency Injection was last edited by husted (05:24 AM). | http://cwiki.apache.org/confluence/display/WW/Dependency+Injection Apache Directory Server v1.0 Documentation (DIRxSRVx10) http://cwiki.apache.org/confluence/display/DIRxSRVx10 | |-Pages Added or Edited in This Space |-- Basic Configuration was last edited by ck (05:16 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Basic+Configuration |-- ApacheDS v1.0 Basic User's Guide was last edited by szoerner (02:36 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/ApacheDS+v1.0+Basic+User%27s+Guide |-- How to enable SSL was created by szoerner (02:06 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/How+to+enable+SSL |-- Some Background. Directories, directory services and LDAP was last edited by szoerner (01:41 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Some+Background.+Directories%2C+directory+services+and+LDAP |-- Graphical tools was last edited by szoerner (08:44 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Graphical+tools Apache Cayenne (CAY) http://cwiki.apache.org/confluence/display/CAY | |-Pages Added or Edited in This Space
svn commit: r478150 - in /struts/sandbox/trunk/tiles: tiles-core/pom.xml tiles-test/src/main/webapp/WEB-INF/web.xml tiles-test/src/main/webapp/testinitcontainer.jsp
Author: apetrelli Date: Wed Nov 22 04:29:14 2006 New Revision: 478150 URL: http://svn.apache.org/viewvc?view=rev&rev=478150 Log: SB-87 Finished adding ALL license headers (I hope so :-) ) Files checked with RAT. Modified: struts/sandbox/trunk/tiles/tiles-core/pom.xml struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinitcontainer.jsp Modified: struts/sandbox/trunk/tiles/tiles-core/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/pom.xml?view=diff&rev=478150&r1=478149&r2=478150 == --- struts/sandbox/trunk/tiles/tiles-core/pom.xml (original) +++ struts/sandbox/trunk/tiles/tiles-core/pom.xml Wed Nov 22 04:29:14 2006 @@ -1,21 +1,25 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml?view=diff&rev=478150&r1=478149&r2=478150 == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml (original) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml Wed Nov 22 04:29:14 2006 @@ -1,4 +1,27 @@ + http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinitcontainer.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinitcontainer.jsp?view=diff&rev=478150&r1=478149&r2=478150 == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinitcontainer.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinitcontainer.jsp Wed Nov 22 04:29:14 2006 @@ -1,3 +1,26 @@ +<%-- +/* + * $Id$ + * + * 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. + * + */ +--%> <%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
svn commit: r478155 - in /struts/sandbox/trunk/tiles: tiles-api/src/main/java/org/apache/tiles/ tiles-api/src/main/java/org/apache/tiles/mgmt/ tiles-core/src/main/java/org/apache/tiles/access/ tiles-c
Author: apetrelli Date: Wed Nov 22 05:08:57 2006 New Revision: 478155 URL: http://svn.apache.org/viewvc?view=rev&rev=478155 Log: SB-87 Added @version JavaDoc tag with $Rev$ and $Date$ Subversion keywords to all Java classes, except those in tiles-documentation Modified: struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/ComponentContext.java struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesException.java struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/access/TilesAccess.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/beans/MenuItem.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicComponentContext.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspWriterResponse.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinition.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactoryException.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/FactoryNotFoundException.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/NoSuchDefinitionException.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/ConfigurationNotSupportedException.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/listener/TilesListener.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/NoSuchPreparerException.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerException.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerFactory.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparerSupport.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ComponentConstants.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/PutListTag.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/PutTag.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/PutTagParent.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apach
svn commit: r478158 - in /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet: ServletHeaderMap.java ServletInitParamMap.java ServletParamMap.java ServletParamValuesMa
Author: ddewolf Date: Wed Nov 22 05:22:37 2006 New Revision: 478158 URL: http://svn.apache.org/viewvc?view=rev&rev=478158 Log: Removing author tags Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java?view=diff&rev=478158&r1=478157&r2=478158 == --- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java (original) +++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java Wed Nov 22 05:22:37 2006 @@ -31,7 +31,6 @@ * Private implementation of Map for servlet request * name-value. * - * @author Craig R. McClanahan * @version $Revision$ $Date$ */ Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java?view=diff&rev=478158&r1=478157&r2=478158 == --- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java (original) +++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java Wed Nov 22 05:22:37 2006 @@ -31,7 +31,6 @@ * Private implementation of Map for servlet context * init parameters. * - * @author Craig R. McClanahan * @version $Revision$ $Date$ */ Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java?view=diff&rev=478158&r1=478157&r2=478158 == --- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java (original) +++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java Wed Nov 22 05:22:37 2006 @@ -32,7 +32,6 @@ * Private implementation of Map for servlet parameter * name-value. * - * @author Craig R. McClanahan * @version $Revision$ $Date$ */ Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java?view=diff&rev=478158&r1=478157&r2=478158 == --- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java (original) +++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java Wed Nov 22 05:22:37 2006 @@ -31,7 +31,6 @@ * Private implementation of Map for servlet parameter * name-values[]. * - * @author Craig R. McClanahan * @version $Revision$ $Date$ */ Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java?view=diff&rev=478158&r1=478157&r2=478158 == --- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java (original) +++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java Wed Nov 22 05:22:37 2006 @@ -32,7 +32,6 @@ * Private implementation of Map for HTTP session * attributes. * - * @author Craig R. McClanahan * @version $Revision$ $Date$ */
svn commit: r478167 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2: config/ClasspathConfigurationProvider.java config/DelegatingSettings.java config/Settings.java dispatcher/Dispatch
Author: husted
Date: Wed Nov 22 06:19:53 2006
New Revision: 478167
URL: http://svn.apache.org/viewvc?view=rev&rev=478167
Log:
WW-1483 Javadoc and IDEA refactorings only. No functional changes.
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DelegatingSettings.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Settings.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java?view=diff&rev=478167&r1=478166&r2=478167
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
Wed Nov 22 06:19:53 2006
@@ -25,7 +25,6 @@
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import java.util.Properties;
import java.util.Set;
import org.apache.commons.logging.Log;
@@ -47,28 +46,94 @@
import com.opensymphony.xwork2.util.location.LocatableProperties;
/**
- * Loads the configuration by scanning the classpath looking for classes that
end in
- * 'Action'.
+ * ClasspathConfigurationProvider loads the configuration
+ * by scanning the classpath or selected packages for Action classes.
+ *
+ * This provider is only invoked if one or more action packages are passed to
the dispatcher,
+ * usually from the web.xml.
+ * Configurations are created for objects that either implement Action or have
classnames that end with "Action".
*/
public class ClasspathConfigurationProvider implements ConfigurationProvider {
+/**
+ * The default page prefix (or "path").
+ * Some applications may place pages under "/WEB-INF" as an extreme
security precaution.
+ */
private static final String DEFAULT_PAGE_PREFIX =
"struts.configuration.classpath.defaultPagePrefix";
+
+/**
+ * The default page prefix (none).
+ */
+private String defaultPagePrefix = "";
+
+/**
+ * The default page extension, to use in place of ".jsp".
+ */
private static final String DEFAULT_PAGE_EXTENSION =
"struts.configuration.classpath.defaultPageExtension";
+
+/**
+ * The defacto default page extension, usually associated with JavaServer
Pages.
+ */
+private String defaultPageExtension = ".jsp";
+
+/**
+ * A setting to indicate a custom default parent package,
+ * to use in place of "struts-default".
+ */
private static final String DEFAULT_PARENT_PACKAGE =
"struts.configuration.classpath.defaultParentPackage";
-private static final String ACTION = "Action";
-private String[] packages;
+
+/**
+ * Name of the framework's default configuration package,
+ * that application configuration packages automatically inherit.
+ */
private String defaultParentPackage = "struts-default";
-private String defaultPageExtension = ".jsp";
-private String defaultPagePrefix = "";
+
+/**
+ * Default suffix that can be used to indicate POJO "Action" classes.
+ */
+private static final String ACTION = "Action";
+
+/**
+ * Helper class to scan class path for server pages.
+ */
private PageLocator pageLocator = new ClasspathPageLocator();
+
+/**
+ * Flag to indicate the packages have been loaded.
+ *
+ * @see #loadPackages
+ * @see #needsReload
+ */
private boolean initialized = false;
+/**
+ * The list of packages to scan for Action classes.
+ */
+private String[] packages;
+
+/**
+ * The package configurations for scanned Actions.
+ *
+ * @see #loadPackageConfig
+ */
private Map loadedPackageConfigs = new
HashMap();
+/**
+ * Logging instance for this class.
+ */
private static final Log LOG =
LogFactory.getLog(ClasspathConfigurationProvider.class);
+/**
+ * The XWork Configuration for this application.
+ *
+ * @see #init
+ */
private Configuration configuration;
+/**
+ * Create instance utilizing a list of packages to scan for Action classes.
+ * @param pkgs List of pacaktges to scan for Action Classes.
+ */
public ClasspathConfigurationProvider(String[] pkgs) {
this.packages = pkgs;
@@ -122,7 +187,7 @@
}
/**
- * @param pkgs
+ * @param pkgs A set of packages to load
*/
protected void loadPackages(String[] pkgs) {
@@ -136,7 +201,7 @@
}
}, pkgs);
-Set actionClasses = resolver.getCl
svn commit: r478174 - in /struts/sandbox/trunk/tiles: tiles-core/src/main/java/org/apache/tiles/context/ tiles-core/src/main/java/org/apache/tiles/context/servlet/ tiles-documentation/src/webapp/examp
Author: apetrelli
Date: Wed Nov 22 06:44:33 2006
New Revision: 478174
URL: http://svn.apache.org/viewvc?view=rev&rev=478174
Log:
SB-87
Replaced $Revision$ with $Rev$
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletRequestScopeMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java
struts/sandbox/trunk/tiles/tiles-documentation/src/webapp/examples/tiles/rssChannelErrors.jsp
struts/sandbox/trunk/tiles/tiles-documentation/src/webapp/examples/tiles/rssChannels.jsp
struts/sandbox/trunk/tiles/tiles-documentation/src/webapp/tutorial/dynPortal/Channels.jsp
struts/sandbox/trunk/tiles/tiles-documentation/src/webapp/tutorial/dynPortal/Errors.jsp
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java?view=diff&rev=478174&r1=478173&r2=478174
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java
Wed Nov 22 06:44:33 2006
@@ -29,7 +29,7 @@
* Map.Entry implementation that can be constructed to either be read-only
* or not.
*
- * @version $Revision$ $Date$
+ * @version $Rev$ $Date$
*/
public class MapEntry implements Map.Entry {
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java?view=diff&rev=478174&r1=478173&r2=478174
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java
Wed Nov 22 06:44:33 2006
@@ -32,7 +32,7 @@
* Private implementation of Map for servlet context
* attributes.
*
- * @version $Revision$ $Date$
+ * @version $Rev$ $Date$
*/
final class ServletApplicationScopeMap implements Map {
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java?view=diff&rev=478174&r1=478173&r2=478174
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java
Wed Nov 22 06:44:33 2006
@@ -31,7 +31,7 @@
* Private implementation of Map for servlet request
* name-value.
*
- * @version $Revision$ $Date$
+ * @version $Rev$ $Date$
*/
final class ServletHeaderMap implements Map {
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java?view=diff&rev=478174&r1=478173&r2=478174
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java
Wed Nov 22 06:44:33 2006
@@ -32,7 +32,7 @@
* Private implementation of Map for servlet request
* name-values[].
*
- * @version $Revision$ $Date$
+ * @version $Rev$ $Date$
*/
final class ServletHeaderValuesMap implement
svn commit: r478202 - in /struts/sandbox/trunk/tiles: pom.xml tiles-api/pom.xml tiles-core/pom.xml
Author: ddewolf
Date: Wed Nov 22 08:04:30 2006
New Revision: 478202
URL: http://svn.apache.org/viewvc?view=rev&rev=478202
Log:
Adding retrotranslator configuration
Modified:
struts/sandbox/trunk/tiles/pom.xml
struts/sandbox/trunk/tiles/tiles-api/pom.xml
struts/sandbox/trunk/tiles/tiles-core/pom.xml
Modified: struts/sandbox/trunk/tiles/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/pom.xml?view=diff&rev=478202&r1=478201&r2=478202
==
--- struts/sandbox/trunk/tiles/pom.xml (original)
+++ struts/sandbox/trunk/tiles/pom.xml Wed Nov 22 08:04:30 2006
@@ -27,11 +27,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
- org.apache.struts
- struts-master
- 4-SNAPSHOT
-
+
+org.apache.struts
+struts-master
+4-SNAPSHOT
+
4.0.0
org.apache.struts.tiles
@@ -45,9 +45,9 @@
2000
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles
- http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles
+http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles
@@ -83,6 +83,7 @@
http://www.apache.org
+
@@ -94,11 +95,31 @@
1.5
+
+
+org.codehaus.mojo
+retrotranslator-maven-plugin
+1.0-SNAPSHOT
+
+
+process-classes
+
+translate
+
+
+
+
+
${pom.basedir}/target/classes
+
+
+
+
+
+
-
+
install
-
@@ -106,7 +127,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
-
+
maven-javadoc-plugin
@@ -126,7 +147,8 @@
maven-checkstyle-plugin
-
http://svn.apache.org/repos/asf/struts/maven/trunk/build/struts_checks.xml
+
http://svn.apache.org/repos/asf/struts/maven/trunk/build/struts_checks.xml
+
@@ -173,11 +195,15 @@
-
-apache.snapshots
-http://people.apache.org/repo/m2-snapshot-repository/
-true
-false
-
-
+
+apache.snapshots
+http://people.apache.org/repo/m2-snapshot-repository/
+
+true
+
+
+false
+
+
+
Modified: struts/sandbox/trunk/tiles/tiles-api/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-api/pom.xml?view=diff&rev=478202&r1=478201&r2=478202
==
--- struts/sandbox/trunk/tiles/tiles-api/pom.xml (original)
+++ struts/sandbox/trunk/tiles/tiles-api/pom.xml Wed Nov 22 08:04:30 2006
@@ -76,6 +76,71 @@
+
+
+
+ j4
+
+
+
+ org.codehaus.mojo
+ retrotranslator-maven-plugin
+
+
+ retrotranslate
+
+
+
+
+ maven-jar-plugin
+
+
+ create-j4-jar
+ jar
+
+
${project.build.directory}/classes-retro
+ j4
+
+
+
${project.artifactId}-j4
+
${project.organization.name}
+
${project.organization.name}
+
${project.description}
+
${project.version}
+ ${scm.revision}
+
+
+
+
+
svn commit: r478247 - in /struts/sandbox/trunk/tiles/tiles-test/src/main/webapp: index.jsp testput_el.jsp
Author: ddewolf Date: Wed Nov 22 09:23:04 2006 New Revision: 478247 URL: http://svn.apache.org/viewvc?view=rev&rev=478247 Log: Adding el tag tests Added: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_el.jsp (with props) Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp?view=diff&rev=478247&r1=478246&r2=478247 == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp Wed Nov 22 09:23:04 2006 @@ -40,6 +40,7 @@ Test Insert Configured Definition with an inline content Test Insert Configured Definition that contains another definition inside Test Put Tag +Test Put Tag using EL Test Put Tag using a servlet mapping as a template Test importAttribute Tag Test importAttribute Tag with no name Added: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_el.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_el.jsp?view=auto&rev=478247 == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_el.jsp (added) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_el.jsp Wed Nov 22 09:23:04 2006 @@ -0,0 +1,33 @@ +<%-- +/* + * $Id$ + * + * 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. + * + */ +--%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> + + + + + + + + \ No newline at end of file Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_el.jsp -- svn:eol-style = native Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_el.jsp -- svn:keywords = Id Author Date Rev
svn commit: r478313 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/config: ClasspathConfigurationProvider.java DefaultSettings.java Settings.java
Author: husted
Date: Wed Nov 22 12:35:46 2006
New Revision: 478313
URL: http://svn.apache.org/viewvc?view=rev&rev=478313
Log:
WW-1483 Javadoc and IDEA refactorings only. No functional changes.
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultSettings.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Settings.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java?view=diff&rev=478313&r1=478312&r2=478313
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
Wed Nov 22 12:35:46 2006
@@ -132,6 +132,7 @@
/**
* Create instance utilizing a list of packages to scan for Action classes.
+ *
* @param pkgs List of pacaktges to scan for Action Classes.
*/
public ClasspathConfigurationProvider(String[] pkgs) {
@@ -151,10 +152,16 @@
}
+/**
+ * PageLocator defines a locate method that can be used to discover server
pages.
+ */
public static interface PageLocator {
public URL locate(String path);
}
+/**
+ * ClasspathPathLocator searches the classpath for server pages.
+ */
public static class ClasspathPageLocator implements PageLocator {
public URL locate(String path) {
return ClassLoaderUtil.getResource(path, getClass());
@@ -162,32 +169,49 @@
}
/**
- * @param defaultParentPackage the defaultParentPackage to set
+ * Register a default parent package for the actions.
+ *
+ * @param defaultParentPackage the new defaultParentPackage
*/
public void setDefaultParentPackage(String defaultParentPackage) {
this.defaultParentPackage = defaultParentPackage;
}
/**
- * @param defaultPageExtension the defaultPageExtension to set
+ * Register a default page extension to use when locating pages.
+ *
+ * @param defaultPageExtension the new defaultPageExtension
*/
public void setDefaultPageExtension(String defaultPageExtension) {
this.defaultPageExtension = defaultPageExtension;
}
/**
+ * Reigster a default page prefix to use when locating pages.
+ *
* @param defaultPagePrefix the defaultPagePrefix to set
*/
public void setDefaultPagePrefix(String defaultPagePrefix) {
this.defaultPagePrefix = defaultPagePrefix;
}
+/**
+ * Register a PageLocation to use to scan for server pages.
+ *
+ * @param locator
+ */
public void setPageLocator(PageLocator locator) {
this.pageLocator = locator;
}
/**
- * @param pkgs A set of packages to load
+ * Scan a list of packages for Action classes.
+ *
+ * This method loads classes that implement the Action interface
+ * or have a class name that ends with the letters "Action".
+ *
+ * @param pkgs A list of packages to load
+ * @see #processActionClass
*/
protected void loadPackages(String[] pkgs) {
@@ -201,6 +225,7 @@
}
}, pkgs);
+
Set> actionClasses =
resolver.getClasses();
for (Object obj : actionClasses) {
Class cls = (Class) obj;
@@ -215,9 +240,14 @@
}
/**
+ * Create a default action mapping for a class instance.
+ *
+ * The namespace annotation is honored, if found, otherwise
+ * the Java package is converted into the namespace
+ * by changing the dots (".") to slashes ("/").
*
* @param cls Action or POJO instance to process
- * @param pkgs Set of packages to scan for Actions
+ * @param pkgs List of packages that were scanned for Actions
*/
protected void processActionClass(Class cls, String[] pkgs) {
String name = cls.getName();
@@ -227,7 +257,7 @@
for (String pkg : pkgs) {
if (name.startsWith(pkg)) {
if (LOG.isDebugEnabled()) {
-LOG.debug("Processing class "+name);
+LOG.debug("ClasspathConfigurationProvider: Processing
class "+name);
}
name = name.substring(pkg.length() + 1);
@@ -249,7 +279,7 @@
String parent = ((ParentPackage)annotation).value();
PackageConfig parentPkg = configuration.getPackageConfig(parent);
if (parentPkg == null) {
-throw new ConfigurationException("Unable to locate parent
package "+parent, annotation);
+
svn commit: r478316 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
Author: husted
Date: Wed Nov 22 12:45:48 2006
New Revision: 478316
URL: http://svn.apache.org/viewvc?view=rev&rev=478316
Log:
WW-1491 Add setting to govern whether to force the initial letter of an action
to lowercase.
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java?view=diff&rev=478316&r1=478315&r2=478316
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
Wed Nov 22 12:45:48 2006
@@ -89,6 +89,19 @@
private String defaultParentPackage = "struts-default";
/**
+ * The default page prefix (or "path").
+ * Some applications may place pages under "/WEB-INF" as an extreme
security precaution.
+ */
+private static final String FORCE_LOWER_CASE =
"struts.configuration.classpath.forceLowerCase";
+
+/**
+ * Whether to use a lowercase letter as the initial letter of an action.
+ * If false, actions will retain the initial uppercase letter from the
Action class.
+ * (view.action (true) versus View.action
(false)).
+ */
+private boolean forceLowerCase = true;
+
+/**
* Default suffix that can be used to indicate POJO "Action" classes.
*/
private static final String ACTION = "Action";
@@ -150,6 +163,9 @@
defaultPagePrefix = Settings.get(DEFAULT_PAGE_PREFIX);
}
+if (Settings.isSet(FORCE_LOWER_CASE)) {
+forceLowerCase =
Settings.get(FORCE_LOWER_CASE).equalsIgnoreCase("true");
+}
}
/**
@@ -293,8 +309,8 @@
actionName = actionName.substring(0, actionName.length() -
ACTION.length());
}
-// Force initial letter of action to lowercase
-if (actionName.length() > 1) {
+// Force initial letter of action to lowercase, if desired
+if ((forceLowerCase) && (actionName.length() > 1)) {
int lowerPos = actionName.lastIndexOf('/') + 1;
StringBuilder sb = new StringBuilder();
sb.append(actionName.substring(0, lowerPos));
