[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- Bundle Plugin for Maven (BND) was last edited by [EMAIL PROTECTED] (01:43 PM). | http://cwiki.apache.org/confluence/display/FELIX/Bundle+Plugin+for+Maven+%28BND%29 |-- iPOJO Tutorial (0.7) was last edited by clement.escoffier (11:12 AM). | http://cwiki.apache.org/confluence/display/FELIX/iPOJO+Tutorial+%280.7%29 OpenEJB (OPENEJB) http://cwiki.apache.org/confluence/display/OPENEJB | |-Pages Added or Edited in This Space |-- HomeLinks was last edited by dblevins (10:11 PM). | http://cwiki.apache.org/confluence/display/OPENEJB/HomeLinks Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid | |-Pages Added or Edited in This Space |-- M1 Release was last edited by mmccorma (12:20 AM). | http://cwiki.apache.org/confluence/display/qpid/M1+Release |-- QpidReleaseProcess was last edited by mmccorma (12:18 AM). | http://cwiki.apache.org/confluence/display/qpid/QpidReleaseProcess Apache Directory Server v1.1 Documentation (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- Backend was created by elecharny (09:00 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/Backend |-- ApacheDS v1.5 Developers's Guide was last edited by elecharny (08:58 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/ApacheDS+v1.5+Developers%27s+Guide Apache Geronimo v1.1 (GMOxDOC11) http://cwiki.apache.org/confluence/display/GMOxDOC11 | |-Pages Added or Edited in This Space |-- openejb-jar.xml was last edited by [EMAIL PROTECTED] (11:34 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/openejb-jar.xml |-- JBoss to Geronimo - JDBC Migration was last edited by [EMAIL PROTECTED] (09:02 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/JBoss+to+Geronimo+-+JDBC+Migration |-- JBoss to Geronimo - Servlets and JSPs Migration was last edited by [EMAIL PROTECTED] (10:10 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/JBoss+to+Geronimo+-+Servlets+and+JSPs+Migration Apache Cayenne Documentation (CAYDOC) http://cwiki.apache.org/confluence/display/CAYDOC | |-Pages Added or Edited in This Space |-- maven2-cgen was last edited by nirvdrum (10:26 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/maven2-cgen Apache Directory Server v1.0 Documentation (DIRxSRVx10) http://cwiki.apache.org/confluence/display/DIRxSRVx10 | |-Pages Added or Edited in This Space |-- ApacheDS v1.0 Developers's Guide was last edited by elecharny (09:50 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/ApacheDS+v1.0+Developers%27s+Guide Apache Struts 2 Wiki (S2WIKI) http://cwiki.apache.org/confluence/display/S2WIKI | |-Pages Added or Edited in This Space |-- Projects Using WebWork or Struts2 was last edited by pato (11:43 AM). | http://cwiki.apache.org/confluence/display/S2WIKI/Projects+Using+WebWork+or+Struts2 Apache CXF (CXF) http://cwiki.apache.org/confluence/display/CXF | |-Pages Added or Edited in This Space |-- Source Repository was last edited by mmao (07:24 PM). | http://cwiki.apache.org/confluence/display/CXF/Source+Repository Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- I18n and resource boundles was created by [EMAIL PROTECTED] (01:03 AM). | http://cwiki.apache.org/confluence/display/WICKET/I18n+and+resource+boundles - CONFLUENCE INFORMATION This message is automatically generated by Confluence Unsubscribe or edit your notifications preferences http://cwiki.apache.org/confluence/users/viewnotifications.action If you think it was sent incorrectly contact one of the administrators http://cwiki.apache.org/confluence/administrators.action If you want more information on Confluence, or have a bug to report see http://www.atlassian.com/software/confluence
svn commit: r470752 - /struts/struts2/trunk/plugins/pom.xml
Author: jmitchell Date: Fri Nov 3 02:41:55 2006 New Revision: 470752 URL: http://svn.apache.org/viewvc?view=rev&rev=470752 Log: Fix pom scm location Modified: struts/struts2/trunk/plugins/pom.xml Modified: struts/struts2/trunk/plugins/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pom.xml?view=diff&rev=470752&r1=470751&r2=470752 == --- struts/struts2/trunk/plugins/pom.xml (original) +++ struts/struts2/trunk/plugins/pom.xml Fri Nov 3 02:41:55 2006 @@ -11,6 +11,13 @@ struts2-plugins pom Struts Plugins + + + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/ + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/ + http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/ + + config-browser jasperreports
svn commit: r470793 - /struts/sandbox/trunk/tiles/tiles-container-test/src/main/
Author: apetrelli Date: Fri Nov 3 05:01:13 2006 New Revision: 470793 URL: http://svn.apache.org/viewvc?view=rev&rev=470793 Log: Corrected svn:externals URL Modified: struts/sandbox/trunk/tiles/tiles-container-test/src/main/ (props changed) Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/ -- --- svn:externals (original) +++ svn:externals Fri Nov 3 05:01:13 2006 @@ -1 +1 @@ -java http://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/java/ +java https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/java/
svn commit: r470817 - in /struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp: ./ WEB-INF/
Author: jmitchell
Date: Fri Nov 3 05:55:57 2006
New Revision: 470817
URL: http://svn.apache.org/viewvc?view=rev&rev=470817
Log:
Remove unused (empty) svn:externals
Modified:
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/ (props
changed)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/
(props changed)
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/
('svn:externals' removed)
Propchange:
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/
('svn:externals' removed)
svn commit: r470893 [2/2] - in /struts/sandbox/trunk/tiles: tiles-api/src/main/java/org/apache/tiles/ tiles-container-test/src/main/webapp/WEB-INF/ tiles-core/src/main/java/org/apache/tiles/context/ t
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/BaseInsertTag.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/BaseInsertTag.java?view=diff&rev=470893&r1=470892&r2=470893
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/BaseInsertTag.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/BaseInsertTag.java
Fri Nov 3 08:42:53 2006
@@ -22,24 +22,20 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.tiles.definition.ComponentAttribute;
-import org.apache.tiles.context.ComponentContext;
+import org.apache.tiles.ComponentAttribute;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.TilesContainer;
+import org.apache.tiles.TilesException;
+import org.apache.tiles.access.TilesAccess;
+import org.apache.tiles.context.BasicComponentContext;
import org.apache.tiles.context.jsp.JspUtil;
-import org.apache.tiles.TilesRequestContext;
-import org.apache.tiles.definition.ComponentDefinition;
-import org.apache.tiles.preparer.ViewPreparer;
-import org.apache.tiles.preparer.NoSuchPreparerException;
-import org.apache.tiles.preparer.PreparerFactory;
-import org.apache.tiles.taglib.util.TagUtils;
-import org.apache.tiles.util.TilesUtil;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import java.io.IOException;
+import java.util.HashMap;
import java.util.Map;
-import java.util.StringTokenizer;
/**
* This is the base abstract class for all Tiles composition JSP tags. The
tag's
@@ -81,7 +77,7 @@
/**
* Current component context.
*/
-protected ComponentContext cachedCurrentContext;
+protected BasicComponentContext cachedCurrentContext;
/**
* Final handler of tag methods.
@@ -94,6 +90,11 @@
protected PageContext pageContext = null;
/**
+ * Container within which we execute.
+ */
+protected TilesContainer container;
+
+/**
* Reset member values for reuse. This method calls super.release(), which
* invokes TagSupport.release(), which typically does nothing.
*/
@@ -245,9 +246,9 @@
/**
* Get current component context.
*/
-protected ComponentContext getCurrentContext() {
+protected BasicComponentContext getCurrentContext() {
if (cachedCurrentContext == null) {
-cachedCurrentContext = (ComponentContext) pageContext.getAttribute(
+cachedCurrentContext = (BasicComponentContext)
pageContext.getAttribute(
ComponentConstants.COMPONENT_CONTEXT,
PageContext.REQUEST_SCOPE);
}
@@ -255,24 +256,6 @@
return cachedCurrentContext;
}
-/**
- * Get instantiated ViewPreparer. Return preparerInstance denoted by
preparerType,
- * or null if preparerType is null.
- *
- * @throws JspException If preparerInstance can't be created.
- */
-protected ViewPreparer getPreparerInstance() throws JspException {
-if (preparer == null) {
-return null;
-}
-
-try {
-PreparerFactory f = TilesUtil.getPreparerFactory();
-return f.getPreparer(preparer, null);
-} catch (NoSuchPreparerException e) {
-throw new JspException(e);
-}
-}
/**
* Process the start tag by checking tag's attributes and creating
@@ -300,6 +283,8 @@
return SKIP_BODY;
}
+container = TilesAccess.getContainer(pageContext.getServletContext());
+
try {
tagHandler = createTagHandler();
@@ -347,68 +332,14 @@
* @throws JspException InstantiationException Can't create requested
* preparerInstance
*/
-protected TagHandler processDefinition(ComponentDefinition definition)
+protected TagHandler processDefinition(String definition, Map attributes)
throws JspException {
// Declare local variable in order to not change Tag attribute values.
String role = this.role;
-String page = this.template;
-ViewPreparer viewPreparer = null;
-
-try {
-
-// Overload definition with tag's template and role.
-if (role == null) {
-role = definition.getRole();
-}
-
-if (page == null) {
-page = definition.getTemplate();
-}
-
-if (preparer != null) {
-viewPreparer = TilesUtil.getPreparerFactory()
-.getPreparer(definition.getPreparer(), null);
-}
+String preparer = this.preparer;
-// Can check if page is set
-return ne
svn commit: r470897 - /struts/sandbox/trunk/tiles/tiles-container-test/
Author: ddewolf Date: Fri Nov 3 08:49:47 2006 New Revision: 470897 URL: http://svn.apache.org/viewvc?view=rev&rev=470897 Log: getting rid of obsolete container tests; the container is now the core Removed: struts/sandbox/trunk/tiles/tiles-container-test/
svn commit: r470898 - /struts/sandbox/trunk/tiles/pom.xml
Author: ddewolf Date: Fri Nov 3 08:50:24 2006 New Revision: 470898 URL: http://svn.apache.org/viewvc?view=rev&rev=470898 Log: removing container test Modified: struts/sandbox/trunk/tiles/pom.xml Modified: struts/sandbox/trunk/tiles/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/pom.xml?view=diff&rev=470898&r1=470897&r2=470898 == --- struts/sandbox/trunk/tiles/pom.xml (original) +++ struts/sandbox/trunk/tiles/pom.xml Fri Nov 3 08:50:24 2006 @@ -63,7 +63,6 @@ tiles-api tiles-core tiles-test -tiles-container-test
svn commit: r470918 - in /struts/sandbox/trunk/tiles: tiles-core/src/main/java/org/apache/tiles/context/ tiles-core/src/main/java/org/apache/tiles/context/enhanced/ tiles-core/src/main/java/org/apache
Author: ddewolf
Date: Fri Nov 3 09:32:25 2006
New Revision: 470918
URL: http://svn.apache.org/viewvc?view=rev&rev=470918
Log:
Adding support for classpath definitions
Added:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java
(with props)
struts/sandbox/trunk/tiles/tiles-test/src/main/resources/
struts/sandbox/trunk/tiles/tiles-test/src/main/resources/org/
struts/sandbox/trunk/tiles/tiles-test/src/main/resources/org/apache/
struts/sandbox/trunk/tiles/tiles-test/src/main/resources/org/apache/tiles/
struts/sandbox/trunk/tiles/tiles-test/src/main/resources/org/apache/tiles/classpath-defs.xml
(with props)
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_classpath.jsp
(with props)
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.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/impl/BasicTilesContainer.java
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.java?view=diff&rev=470918&r1=470917&r2=470918
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.java
Fri Nov 3 09:32:25 2006
@@ -67,13 +67,13 @@
public TilesRequestContext createRequestContext(TilesApplicationContext
context,
Object request,
Object response) {
-if (context instanceof ServletTilesApplicationContext) {
-ServletTilesApplicationContext app =
(ServletTilesApplicationContext) context;
-
-return new ServletTilesRequestContext(app.getServletContext(),
+ServletContext servletContext = getServletContext(context);
+PortletContext portletContext = getPortletContext(context);
+if (servletContext != null) {
+return new ServletTilesRequestContext(servletContext,
(HttpServletRequest) request,
(HttpServletResponse) response);
-} else if (context instanceof PortletContext) {
+} else if (portletContext != null) {
PortletTilesApplicationContext app =
(PortletTilesApplicationContext) context;
return new PortletTilesRequestContext(app.getPortletContext(),
(PortletRequest) request,
@@ -86,10 +86,27 @@
public TilesRequestContext createRequestContext(TilesApplicationContext
context,
PageContext pageContext) {
+ServletContext servletContext = getServletContext(context);
+if (servletContext != null) {
+return new JspTilesRequestContext(servletContext, pageContext);
+}
+throw new IllegalArgumentException("The context/pageContext
combination is not supported.");
+}
+
+protected ServletContext getServletContext(TilesApplicationContext
context) {
if (context instanceof ServletTilesApplicationContext) {
ServletTilesApplicationContext app =
(ServletTilesApplicationContext) context;
-return new JspTilesRequestContext(app.getServletContext(),
pageContext);
+return app.getServletContext();
}
-throw new IllegalArgumentException("The context/pageContext
combination is not supported.");
+return null;
+
+}
+
+protected PortletContext getPortletContext(TilesApplicationContext
context) {
+if (context instanceof PortletTilesApplicationContext) {
+PortletTilesApplicationContext app =
(PortletTilesApplicationContext) context;
+return app.getPortletContext();
+}
+return null;
}
}
Added:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java?view=auto&rev=470918
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java
(added)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/j
svn commit: r470930 - in /struts/sandbox/trunk/tiles: tiles-core/src/main/java/org/apache/tiles/factory/ tiles-test/src/main/java/org/apache/tiles/test/preparer/ tiles-test/src/main/java/org/apache/ti
Author: ddewolf
Date: Fri Nov 3 10:05:55 2006
New Revision: 470930
URL: http://svn.apache.org/viewvc?view=rev&rev=470930
Log:
Adding Preparer support and associated functional test
Added:
struts/sandbox/trunk/tiles/tiles-test/src/main/java/org/apache/tiles/test/preparer/
struts/sandbox/trunk/tiles/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java
(with props)
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_preparer.jsp
(with props)
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
struts/sandbox/trunk/tiles/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java?view=diff&rev=470930&r1=470929&r2=470930
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
Fri Nov 3 10:05:55 2006
@@ -22,6 +22,8 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
+import org.apache.tiles.preparer.BasicPreparerFactory;
+import org.apache.tiles.preparer.PreparerFactory;
import org.apache.tiles.context.BasicTilesContextFactory;
import org.apache.tiles.context.TilesContextFactory;
import org.apache.tiles.definition.DefinitionsFactory;
@@ -52,12 +54,16 @@
public static final String DEFINITIONS_FACTORY_INIT_PARAM =
"org.apache.tiles.DEFINITIONS_FACTORY";
+public static final String PREPARER_FACTORY_INIT_PARAM =
+"org.apache.tiles.PREPARER_FACTORY";
+
private static final Map DEFAULT_IMPLEMENTATIONS = new HashMap();
static {
DEFAULT_IMPLEMENTATIONS.put(CONTAINER_FACTORY_INIT_PARAM,
TilesContainerFactory.class.getName());
DEFAULT_IMPLEMENTATIONS.put(CONTEXT_FACTORY_INIT_PARAM,
BasicTilesContextFactory.class.getName());
DEFAULT_IMPLEMENTATIONS.put(DEFINITIONS_FACTORY_INIT_PARAM,
UrlDefinitionsFactory.class.getName());
+DEFAULT_IMPLEMENTATIONS.put(PREPARER_FACTORY_INIT_PARAM,
BasicPreparerFactory.class.getName());
}
/**
@@ -91,8 +97,12 @@
DefinitionsFactory defsFactory =
(DefinitionsFactory) createFactory(context,
DEFINITIONS_FACTORY_INIT_PARAM);
+PreparerFactory prepFactory =
+(PreparerFactory) createFactory(context,
PREPARER_FACTORY_INIT_PARAM);
+
container.setDefinitionsFactory(defsFactory);
container.setContextFactory(contextFactory);
+container.setPreparerFactory(prepFactory);
TilesApplicationContext tilesContext =
contextFactory.createApplicationContext(context);
Added:
struts/sandbox/trunk/tiles/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java?view=auto&rev=470930
==
---
struts/sandbox/trunk/tiles/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java
(added)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java
Fri Nov 3 10:05:55 2006
@@ -0,0 +1,38 @@
+/*
+ * 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.tiles.test.preparer;
+
+import org.apache.tiles.preparer.ViewPreparer;
+import org.apache.tiles.TilesRequestContext;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.ComponentAttribute;
+
+/**
+ *
+ */
+public class Tes
svn commit: r470947 - in /struts/sandbox/trunk/tiles: tiles-api/src/main/java/org/apache/tiles/ tiles-core/src/main/java/org/apache/tiles/context/ tiles-core/src/main/java/org/apache/tiles/context/enh
Author: ddewolf
Date: Fri Nov 3 11:00:10 2006
New Revision: 470947
URL: http://svn.apache.org/viewvc?view=rev&rev=470947
Log:
Cleaning up the api; Simplifying and adding more docs
Added:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/ComponentListAttribute.java
(contents, props changed)
- copied, changed from r470901,
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/ComponentListAttribute.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java
(contents, props changed)
- copied, changed from r470901,
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesRequestContext.java
Removed:
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/ComponentListAttribute.java
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesRequestContext.java
Modified:
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/ComponentAttribute.java
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-core/src/main/java/org/apache/tiles/context/BasicComponentContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.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/enhanced/EnhancedContextFactory.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/portlet/PortletTilesApplicationContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesApplicationContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.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/preparer/BasicPreparerFactory.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/taglib/InsertDefinitionTag.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockPublicUrlDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java
struts/sandbox/trunk/tiles/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java
Modified:
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/ComponentAttribute.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/ComponentAttribute.java?view=diff&rev=470947&r1=470946&r2=470947
==
---
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/ComponentAttribute.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/ComponentAttribute.java
Fri Nov 3 11:00:10 2006
@@ -64,6 +64,7 @@
/**
* Constructor.
*
+ * @param name name of the attribute
* @param value Object to store.
*/
public ComponentAttribute(String name, Object value) {
@@ -97,6 +98,7 @@
/**
* Get role.
+ * @return the name of the required role(s)
*/
public String getRole() {
return
svn commit: r470971 - in /struts/sandbox/trunk/tiles: tiles-core/src/main/java/org/apache/tiles/context/jsp/ tiles-core/src/main/java/org/apache/tiles/context/servlet/ tiles-core/src/main/java/org/apa
Author: ddewolf
Date: Fri Nov 3 11:57:27 2006
New Revision: 470971
URL: http://svn.apache.org/viewvc?view=rev&rev=470971
Log:
Code cleanup
Added:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/ClassUtil.java
(with props)
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/classpath.jsp (with
props)
Removed:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactoryConfig.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/RequestUtils.java
Modified:
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/servlet/ServletHeaderValuesMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.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/preparer/BasicPreparerFactory.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/taglib/BaseInsertTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/DefinitionTag.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/InitDefinitionsTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/util/TagUtils.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/preparer/BasicPreparerFactoryTest.java
struts/sandbox/trunk/tiles/tiles-test/src/main/resources/org/apache/tiles/classpath-defs.xml
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java?view=diff&rev=470971&r1=470970&r2=470971
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
Fri Nov 3 11:57:27 2006
@@ -57,25 +57,10 @@
public void include(String path) throws TilesException {
try {
-include(path, false);
+JspUtil.doInclude(pageContext, path, false);
} catch (JspException e) {
throw new TilesException(e);
}
}
-
-/**
- * Do an include of specified page using PageContext.include().
- *
- * This method is used by the Tiles package when an include is required.
- * The Tiles package can use indifferently any form of this method.
- *
- * @param path Uri or Definition name to forward.
- * @param flush If the writer should be flushed before the include
- * @throws JspException if the underlying include fails
- */
-public void include(String path, boolean flush) throws JspException {
-JspUtil.doInclude(pageContext, path, flush);
-}
-
}
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=470971&r1=470970&r2=470971
==
---
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
Fri Nov 3 11:57:27 2006
@@ -97,12 +97,12 @@
public Object get(Object key) {
-List list = new ArrayList();
-Enumeration values = request.getHeaders(key(key));
+List list = new ArrayList();
+Enumeration values = request.getHeaders(key(key));
while (values.hasMoreElements()) {
-list.add((String) values.nextElement());
+list.add(values.nextElement());
}
-return (((String[]) list.toArray(new String[list.size()])));
+return
svn commit: r470972 - in /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles: servlet/ServletContextAdapter.java taglib/util/TagUtils.java
Author: ddewolf
Date: Fri Nov 3 12:09:00 2006
New Revision: 470972
URL: http://svn.apache.org/viewvc?view=rev&rev=470972
Log:
More code cleanup; Removing unused methods;
Modified:
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/taglib/util/TagUtils.java
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java?view=diff&rev=470972&r1=470971&r2=470972
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java
Fri Nov 3 12:09:00 2006
@@ -26,6 +26,7 @@
import java.net.MalformedURLException;
import java.io.InputStream;
[EMAIL PROTECTED]("deprecation")
public class ServletContextAdapter implements ServletContext {
private ServletContext rootContext;
@@ -73,14 +74,17 @@
return rootContext.getNamedDispatcher(string);
}
+@SuppressWarnings("deprecation")
public Servlet getServlet(String string) throws ServletException {
return rootContext.getServlet(string);
}
+@SuppressWarnings("deprecation")
public Enumeration getServlets() {
return rootContext.getServlets(); //To change body of implemented
methods use File | Settings | File Templates.
}
+@SuppressWarnings("deprecation")
public Enumeration getServletNames() {
return rootContext.getServletNames();
}
@@ -89,6 +93,7 @@
rootContext.log(string);
}
+@SuppressWarnings("deprecation")
public void log(Exception exception, String string) {
rootContext.log(exception, string);
}
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/util/TagUtils.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/util/TagUtils.java?view=diff&rev=470972&r1=470971&r2=470972
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/util/TagUtils.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/util/TagUtils.java
Fri Nov 3 12:09:00 2006
@@ -19,19 +19,14 @@
*/
package org.apache.tiles.taglib.util;
-import org.apache.commons.beanutils.PropertyUtils;
import org.apache.tiles.ComponentContext;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.ComponentAttribute;
import org.apache.tiles.definition.ComponentDefinition;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.taglib.ComponentConstants;
-import javax.servlet.ServletContext;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
-import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.Map;
@@ -65,11 +60,6 @@
scopes.put("application", PageContext.APPLICATION_SCOPE);
}
-public static TilesApplicationContext getTilesContext(ServletContext
context) {
-return TilesAccess.getApplicationContext(context);
-}
-
-
/**
* Get scope value from string value
*
@@ -116,81 +106,6 @@
return scope;
}
-
-/**
- * Return the value of the specified property of the specified bean,
- * no matter which property reference format is used, with no
- * type conversions.
- *
- * @param bean Bean whose property is to be extracted.
- * @param name Possibly indexed and/or nested name of the property
- * to be extracted.
- * @throws IllegalAccessExceptionif the caller does not have
- * access to the property accessor method
- * @throws InvocationTargetException if the property accessor method
- * throws an exception
- * @throws NoSuchMethodException if an accessor method for this
- * propety cannot be found.
- * @deprecated Use PropertyUtils.getProperty() directly. This will be
removed
- * after Struts 1.2.
- */
-public static Object getProperty(Object bean, String name)
-throws
-IllegalAccessException,
-InvocationTargetException,
-NoSuchMethodException {
-
-return PropertyUtils.getProperty(bean, name);
-}
-
-/**
- * Retrieve bean from page context, using specified scope.
- * If scope is not set, use findAttribute().
- *
- * @pa
