[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Geronimo v1.2 (GMOxDOC12) http://cwiki.apache.org/confluence/display/GMOxDOC12 | |-Pages Added or Edited in This Space |-- Documentation was last edited by hcunico (10:58 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC12/Documentation Apache Geronimo Development (GMOxDEV) http://cwiki.apache.org/confluence/display/GMOxDEV | |-Pages Added or Edited in This Space |-- Java EE 5 Annotations was created by dblevins (11:13 PM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Java+EE+5+Annotations Apache Directory Server v1.1 Documentation (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- Schema Normalizers was last edited by elecharny (10:04 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/Schema+Normalizers |-- ApacheDS v1.5 Developer's Guide was last edited by ck (05:35 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/ApacheDS+v1.5+Developer%27s+Guide |-- Apache DS initialization was last edited by ck (05:35 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/Apache+DS+initialization Apache Geronimo v2.0 (GMOxDOC20) http://cwiki.apache.org/confluence/display/GMOxDOC20 | |-Pages Added or Edited in This Space |-- Troubleshooting was last edited by hcunico (06:52 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/Troubleshooting |-- How to get JNDI working in Geronimo 2.0 was last edited by hcunico (06:43 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/How+to+get+JNDI+working+in+Geronimo+2.0 |-- Working examples was created by hcunico (06:40 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/Working+examples |-- Quick start - Apache Geronimo for the impatient was last edited by hcunico (05:26 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/Quick+start+-+Apache+Geronimo+for+the+impatient |-- RELEASE-NOTES-2.0-M1.TXT was last edited by hcunico (05:25 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/RELEASE-NOTES-2.0-M1.TXT Apache Axis2 (AXIS2) http://cwiki.apache.org/confluence/display/AXIS2 | |-Pages Added or Edited in This Space |-- Index was created by husted (04:47 AM). | http://cwiki.apache.org/confluence/display/AXIS2/Index Apache Geronimo v1.1 (GMOxDOC11) http://cwiki.apache.org/confluence/display/GMOxDOC11 | |-Pages Added or Edited in This Space |-- JBoss to Geronimo - Security Migration was last edited by [EMAIL PROTECTED] (11:53 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/JBoss+to+Geronimo+-+Security+Migration |-- openejb-jar.xml was last edited by [EMAIL PROTECTED] (09:27 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/openejb-jar.xml |-- Quick start - Apache Geronimo for the impatient was last edited by lidencia (06:03 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/Quick+start+-+Apache+Geronimo+for+the+impatient |-- Apache Geronimo v1.1 - Guide de l'utilisateur was last edited by lidencia (05:55 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/Apache+Geronimo+v1.1+-+Guide+de+l%27utilisateur Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- How do I set a global resource bundle was last edited by deccico (04:54 PM). | http://cwiki.apache.org/confluence/display/WW/How+do+I+set+a+global+resource+bundle Apache Directory Server v1.0 Documentation (DIRxSRVx10) http://cwiki.apache.org/confluence/display/DIRxSRVx10 | |-Pages Added or Edited in This Space |-- ApacheDS v1.0 Advanced User's Guide was last edited by ck (05:59 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/ApacheDS+v1.0+Advanced+User%27s+Guide |-- Interceptors was last edited by ck (05:35 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Interceptors |-- Custom Schema was last edited by ck (04:57 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Custom+Schema |-- The Administrative Model was last edited by ck (04:57 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/The+Administrative+Model |-- Collective Attributes was last edited by ck (04:56 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Collective+Attributes |-- Reporting Bugs was last edited by ck (04:56 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Reporting+Bugs |-- Kerberos Protocol Provider was created by ck (02:51 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Kerberos+Protocol+Provider |-- Basic configuration tasks was last edited by ck (02:20 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx1
svn commit: r492554 - in /struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2: TilesPlugin.java TilesRequestProcessor.java commands/TilesPreProcessor.java
Author: apetrelli
Date: Thu Jan 4 05:12:28 2007
New Revision: 492554
URL: http://svn.apache.org/viewvc?view=rev&rev=492554
Log:
STR-2986
Added module-aware code to provide different definitions with different modules.
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java?view=diff&rev=492554&r1=492553&r2=492554
==
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
Thu Jan 4 05:12:28 2007
@@ -21,6 +21,9 @@
package org.apache.struts.tiles2;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.servlet.ServletException;
import org.apache.commons.logging.Log;
@@ -37,7 +40,14 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
import org.apache.tiles.access.TilesAccess;
+import org.apache.tiles.context.BasicTilesContextFactory;
+import org.apache.tiles.definition.DefinitionsFactory;
+import org.apache.tiles.definition.UrlDefinitionsFactory;
+import org.apache.tiles.factory.KeyedDefinitionsFactoryTilesContainerFactory;
import org.apache.tiles.factory.TilesContainerFactory;
+import org.apache.tiles.impl.BasicTilesContainer;
+import org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer;
+import org.apache.tiles.preparer.BasicPreparerFactory;
/**
* Tiles Plugin used to initialize Tiles.
@@ -67,6 +77,24 @@
// TODO Complete the plugin to be module-aware.
public class TilesPlugin implements PlugIn {
+private static final Map MODULE_AWARE_DEFAULTS =
+new HashMap();
+
+static {
+MODULE_AWARE_DEFAULTS.put(TilesContainerFactory
+.CONTAINER_FACTORY_INIT_PARAM,
+KeyedDefinitionsFactoryTilesContainerFactory.class.getName());
+MODULE_AWARE_DEFAULTS.put(TilesContainerFactory
+.CONTEXT_FACTORY_INIT_PARAM,
+BasicTilesContextFactory.class.getName());
+MODULE_AWARE_DEFAULTS.put(TilesContainerFactory
+.DEFINITIONS_FACTORY_INIT_PARAM,
+UrlDefinitionsFactory.class.getName());
+MODULE_AWARE_DEFAULTS.put(TilesContainerFactory
+.PREPARER_FACTORY_INIT_PARAM,
+BasicPreparerFactory.class.getName());
+}
+
/**
* Commons Logging instance.
*/
@@ -132,12 +160,58 @@
// Initialize Tiles
try {
-TilesContainerFactory factory = TilesContainerFactory
-.getFactory(currentPlugInConfigContextAdapter);
-TilesContainer container = factory.createContainer(
-currentPlugInConfigContextAdapter);
-TilesAccess.setContainer(currentPlugInConfigContextAdapter,
-container);
+TilesContainerFactory factory;
+TilesContainer container;
+if (moduleAware) {
+factory = TilesContainerFactory.getFactory(
+currentPlugInConfigContextAdapter,
+MODULE_AWARE_DEFAULTS);
+container = TilesAccess.getContainer(
+currentPlugInConfigContextAdapter);
+if (container == null) {
+container = factory.createContainer(
+currentPlugInConfigContextAdapter);
+TilesAccess.setContainer(currentPlugInConfigContextAdapter,
+container);
+}
+if (container instanceof
KeyedDefinitionsFactoryTilesContainer) {
+if (factory instanceof
KeyedDefinitionsFactoryTilesContainerFactory) {
+DefinitionsFactory defsFactory =
+((KeyedDefinitionsFactoryTilesContainerFactory)
factory)
+
.createDefinitionsFactory(currentPlugInConfigContextAdapter);
+Map initParameters = new
HashMap();
+String param = (String) currentPlugInConfigObject
+.getProperties().get(BasicTilesContainer
+.DEFINITIONS_CONFIG);
+if (param == null) {
+param = (String) currentPlugInConfigObject
+.getProperties().get("definitions-config");
+}
+if (param != null) {
+
svn commit: r492788 - in /struts/struts2/trunk/plugins/codebehind/src: main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java main/resources/struts-plugin.xml test/java/org/apache/strut
Author: mrdon
Date: Thu Jan 4 14:43:10 2007
New Revision: 492788
URL: http://svn.apache.org/viewvc?view=rev&rev=492788
Log:
Added ability to customize template path prefix
WW-1595
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
struts/struts2/trunk/plugins/codebehind/src/main/resources/struts-plugin.xml
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java?view=diff&rev=492788&r1=492787&r2=492788
==
---
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
Thu Jan 4 14:43:10 2007
@@ -53,14 +53,19 @@
*/
public class CodebehindUnknownHandler implements UnknownHandler {
-protected String defaultPackageName = "codebehind-default";
+protected String defaultPackageName;
protected ServletContext servletContext;
protected Map resultsByExtension;
-protected String templatePathPrefix = "/";
+protected String templatePathPrefix;
protected Configuration configuration;
protected ObjectFactory objectFactory;
protected static final Log LOG =
LogFactory.getLog(CodebehindUnknownHandler.class);
+
+@Inject("struts.codebehind.pathPrefix")
+public void setPathPrefix(String prefix) {
+this.templatePathPrefix=prefix;
+}
@Inject("struts.codebehind.defaultPackage")
public void setDefaultPackage(String pkg) {
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/resources/struts-plugin.xml?view=diff&rev=492788&r1=492787&r2=492788
==
---
struts/struts2/trunk/plugins/codebehind/src/main/resources/struts-plugin.xml
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/main/resources/struts-plugin.xml
Thu Jan 4 14:43:10 2007
@@ -6,7 +6,10 @@
-
+
+
+
+
Modified:
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java?view=diff&rev=492788&r1=492787&r2=492788
==
---
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
Thu Jan 4 14:43:10 2007
@@ -44,10 +44,11 @@
super.setUp();
mockServletContext = new Mock(ServletContext.class);
handler = new CodebehindUnknownHandler();
+handler.setDefaultPackage("codebehind-default");
+handler.setPathPrefix("/");
handler.setConfiguration(configuration);
handler.setObjectFactory(container.getInstance(ObjectFactory.class));
handler.setServletContext((ServletContext)mockServletContext.proxy());
-
}
public void testBuildResult() {
