date:20061212

[CONF] Confluence Changes in the last 24 hours

2006-12-12 Thread confluence

-
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
 |-- GeronimoModuleView was last edited by ryan (09:40 PM).
 |   http://cwiki.apache.org/confluence/display/GMOxDEV/GeronimoModuleView
 |-- Geronimo Kernel was last edited by ryan (08:57 PM).
 |   http://cwiki.apache.org/confluence/display/GMOxDEV/Geronimo+Kernel
 |-- ArchitectureGBeans was last edited by ryan (08:30 PM).
 |   http://cwiki.apache.org/confluence/display/GMOxDEV/ArchitectureGBeans
 |-- ArchitectureIntroduction was last edited by ryan (06:02 PM).
 |   http://cwiki.apache.org/confluence/display/GMOxDEV/ArchitectureIntroduction

OpenJPA (openjpa) http://cwiki.apache.org/confluence/display/openjpa
|
|-Pages Added or Edited in This Space
 |-- Releasing OpenJPA was last edited by mprudhom (05:43 PM).
 |   http://cwiki.apache.org/confluence/display/openjpa/Releasing+OpenJPA
 |-- Documentation was last edited by mprudhom (03:58 PM).
 |   http://cwiki.apache.org/confluence/display/openjpa/Documentation

Apache Directory Server v1.1 Documentation (DIRxSRVx11) 
http://cwiki.apache.org/confluence/display/DIRxSRVx11
|
|-Pages Added or Edited in This Space
 |-- MetaSchema schema was last edited by elecharny (04:46 PM).
 |   http://cwiki.apache.org/confluence/display/DIRxSRVx11/MetaSchema+schema
 |-- MetaSchema was last edited by elecharny (11:17 AM).
 |   http://cwiki.apache.org/confluence/display/DIRxSRVx11/MetaSchema

Apache Geronimo Project Management (GMOxPMGT) 
http://cwiki.apache.org/confluence/display/GMOxPMGT
|
|-Pages Added or Edited in This Space
 |-- Geronimo Package Tracking was last edited by drwoods (06:45 PM).
 |   
http://cwiki.apache.org/confluence/display/GMOxPMGT/Geronimo+Package+Tracking

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] (10:45 PM).
 |   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
 |-- FreeMarker was last edited by deccico (01:46 AM).
 |   http://cwiki.apache.org/confluence/display/WW/FreeMarker

Apache Directory Server v1.0 Documentation (DIRxSRVx10) 
http://cwiki.apache.org/confluence/display/DIRxSRVx10
|
|-Pages Added or Edited in This Space
 |-- Mozilla Thunderbird was last edited by ck (04:58 PM).
 |   http://cwiki.apache.org/confluence/display/DIRxSRVx10/Mozilla+Thunderbird
 |-- Other programming languages was last edited by ck (07:31 AM).
 |   
http://cwiki.apache.org/confluence/display/DIRxSRVx10/Other+programming+languages
 |-- Apache HTTP Server was last edited by ck (03:36 AM).
 |   http://cwiki.apache.org/confluence/display/DIRxSRVx10/Apache+HTTP+Server

Apache Struts 2 Wiki (S2WIKI) http://cwiki.apache.org/confluence/display/S2WIKI
|
|-Pages Added or Edited in This Space
 |-- Ajax Tags was last edited by musachy (08:42 PM).
 |   http://cwiki.apache.org/confluence/display/S2WIKI/Ajax+Tags
 |-- Projects Using WebWork or Struts2 was last edited by [EMAIL PROTECTED] 
(06:25 PM).
 |   
http://cwiki.apache.org/confluence/display/S2WIKI/Projects+Using+WebWork+or+Struts2
 |-- Articles and press was last edited by [EMAIL PROTECTED] (04:15 PM).
 |   http://cwiki.apache.org/confluence/display/S2WIKI/Articles+and+press

Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET
|
|-Pages Added or Edited in This Space
 |-- Bookmarkable pages and links was last edited by novotnyr (11:30 PM).
 |   
http://cwiki.apache.org/confluence/display/WICKET/Bookmarkable+pages+and+links
 |-- Referencing Models From Inner Classes was last edited by novotnyr (11:17 
PM).
 |   
http://cwiki.apache.org/confluence/display/WICKET/Referencing+Models+From+Inner+Classes

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 (06:16 AM).
 |   http://cwiki.apache.org/confluence/display/GMOxDOC12/Documentation

Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX
|
|-Pages Added or Edited in This Space
 |-- Apache Felix Usage Documentation was last edited by [EMAIL PROTECTED] 
(06:21 AM).
 |   
http://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Usage+Documentation

OpenEJB (OPENEJB) http://cwiki.apache.org/confluence/display/OPENEJB
|
|-Pages Added or Edited in This Space
 |-- OpenEJB 1.0 was last edited by dblevins (03:00 PM).
 |   http://cwiki.apache.org/confluence/display/OPENEJB/OpenEJB+1.0

Apache Qpid (qpid) http://cwiki.apache.org/confluence/display

svn commit: r486112 [2/2] - in /struts/struts1/trunk/tiles2: ./ src/main/java/org/apache/struts/tiles/ src/main/java/org/apache/struts/tiles/actions/ src/main/java/org/apache/struts/tiles/beans/ src/m

2006-12-12 Thread apetrelli

Copied: 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTag.java
 (from r483436, 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTag.java)
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTag.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTag.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTag.java&r2=486112
==
--- 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTag.java
 (original)
+++ 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTag.java
 Tue Dec 12 04:33:33 2006
@@ -19,14 +19,14 @@
  * under the License.
  */
 
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.TagSupport;
 
-import org.apache.struts.tiles.taglib.util.TagUtils;
-import org.apache.struts.tiles.ComponentContext;
+import org.apache.struts.tiles2.ComponentContext;
+import org.apache.struts.tiles2.taglib.util.TagUtils;
 
 
 /**

Copied: 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTei.java
 (from r483436, 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTei.java)
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTei.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTei.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTei.java&r2=486112
==
--- 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTei.java
 (original)
+++ 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTei.java
 Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
 
 
 import javax.servlet.jsp.tagext.TagData;

Modified: 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/util/TagUtils.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/util/TagUtils.java?view=diff&rev=486112&r1=483436&r2=486112
==
--- 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/util/TagUtils.java
 (original)
+++ 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/util/TagUtils.java
 Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-package org.apache.struts.tiles.taglib.util;
+package org.apache.struts.tiles2.taglib.util;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
@@ -30,13 +30,13 @@
 
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.struts.Globals;
-import org.apache.struts.tiles.taglib.ComponentConstants;
-import org.apache.struts.tiles.ComponentContext;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.FactoryNotFoundException;
-import org.apache.struts.tiles.NoSuchDefinitionException;
-import org.apache.struts.tiles.TilesUtil;
+import org.apache.struts.tiles2.ComponentContext;
+import org.apache.struts.tiles2.ComponentDefinition;
+import org.apache.struts.tiles2.DefinitionsFactoryException;
+import org.apache.struts.tiles2.FactoryNotFoundException;
+import org.apache.struts.tiles2.NoSuchDefinitionException;
+import org.apache.struts.tiles2.TilesUtil;
+import org.apache.struts.tiles2.taglib.ComponentConstants;
 
 /**
  * Collection of utilities.

Modified: 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/DefinitionsFactory.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/DefinitionsFactory.java?view=diff&rev=486112&r1=483436&r2=486112
==
--- 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/DefinitionsFactory.java
 (original)
+++ 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/DefinitionsFactory.java
 Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-package org.apache.struts.tiles.xmlDefinition;
+package org.apache.struts.tiles2.xmlDefinition;
 
 import java.io.Serializable;
 import j

svn commit: r486113 - in /struts/struts1/trunk/tiles2/src/test/java/org/apache/struts: tiles/ tiles2/ tiles2/CustomI18nFactorySet.java tiles2/TestTilesPlugin.java tiles2/config/

2006-12-12 Thread apetrelli

Author: apetrelli
Date: Tue Dec 12 04:38:03 2006
New Revision: 486113

URL: http://svn.apache.org/viewvc?view=rev&rev=486113
Log:
STR-2986
Refactored main package name in test folder.

Added:
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/

struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/CustomI18nFactorySet.java
  - copied, changed from r486112, 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/CustomI18nFactorySet.java

struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
  - copied, changed from r486112, 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/config/
  - copied from r486112, 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/config/
Removed:
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/

Copied: 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/CustomI18nFactorySet.java
 (from r486112, 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/CustomI18nFactorySet.java)
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/CustomI18nFactorySet.java?view=diff&rev=486113&p1=struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/CustomI18nFactorySet.java&r1=486112&p2=struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/CustomI18nFactorySet.java&r2=486113
==
--- 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/CustomI18nFactorySet.java
 (original)
+++ 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/CustomI18nFactorySet.java
 Tue Dec 12 04:38:03 2006
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
 
 import java.util.Map;
 import java.util.Locale;

Copied: 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
 (from r486112, 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java)
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java?view=diff&rev=486113&p1=struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java&r1=486112&p2=struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java&r2=486113
==
--- 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java
 (original)
+++ 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
 Tue Dec 12 04:38:03 2006
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
 
 import org.apache.struts.config.ModuleConfig;
 import org.apache.struts.config.ModuleConfigFactory;

svn commit: r486114 - /struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/

2006-12-12 Thread apetrelli

Author: apetrelli
Date: Tue Dec 12 04:41:45 2006
New Revision: 486114

URL: http://svn.apache.org/viewvc?view=rev&rev=486114
Log:
STR-2986
Removed vestigial directory, not removed during the refactoring.

Removed:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/

svn commit: r486115 - /struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/

2006-12-12 Thread apetrelli

Author: apetrelli
Date: Tue Dec 12 04:43:00 2006
New Revision: 486115

URL: http://svn.apache.org/viewvc?view=rev&rev=486115
Log:
STR-2986
Removed another vestigial directory, not removed during the refactoring.

Removed:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/

svn commit: r486116 - in /struts/struts1/trunk/tiles2/src/main/resources/org/apache/struts: tiles/ tiles2/

2006-12-12 Thread apetrelli

Author: apetrelli
Date: Tue Dec 12 04:45:17 2006
New Revision: 486116

URL: http://svn.apache.org/viewvc?view=rev&rev=486116
Log:
STR-2986
Refactored main package name in main/resources folder.

Added:
struts/struts1/trunk/tiles2/src/main/resources/org/apache/struts/tiles2/
  - copied from r486115, 
struts/struts1/trunk/tiles2/src/main/resources/org/apache/struts/tiles/
Removed:
struts/struts1/trunk/tiles2/src/main/resources/org/apache/struts/tiles/

svn commit: r486123 - /struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java

2006-12-12 Thread apetrelli

Author: apetrelli
Date: Tue Dec 12 05:03:45 2006
New Revision: 486123

URL: http://svn.apache.org/viewvc?view=rev&rev=486123
Log:
STR-2986

Converted ReloadDefinitionsAction.

Modified:

struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java

Modified: 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java?view=diff&rev=486123&r1=486122&r2=486123
==
--- 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java
 (original)
+++ 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java
 Tue Dec 12 05:03:45 2006
@@ -32,11 +32,8 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles2.DefinitionsFactory;
-import org.apache.struts.tiles2.DefinitionsFactoryException;
-import org.apache.struts.tiles2.TilesUtil;
-
-
+import org.apache.tiles.definition.DefinitionsFactoryException;
+import org.apache.tiles.definition.util.DefinitionsFactoryUtil;
 
 /**
  * A standard Action that calls the
@@ -74,12 +71,8 @@
 
 try {
   ServletContext context = getServlet().getServletContext();
-DefinitionsFactory factory = 
TilesUtil.getDefinitionsFactory(request, context);
-factory.setConfig(factory.getConfig(), context);
+  DefinitionsFactoryUtil.reloadDefinitionsFactory(context);
 writer.println("OK");
-} catch (ClassCastException e) {
-writer.println("FAIL - " + e.toString());
-getServlet().log("ReloadAction", e);
 } catch (DefinitionsFactoryException e) {
 writer.println("FAIL - " + e.toString());
 getServlet().log("ReloadAction", e);

svn commit: r486120 - /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/

2006-12-12 Thread apetrelli

Author: apetrelli
Date: Tue Dec 12 04:58:15 2006
New Revision: 486120

URL: http://svn.apache.org/viewvc?view=rev&rev=486120
Log:
Moved DefinitionsFactory reload in a utility class.

Added:

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/

svn commit: r486121 - in /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles: definition/util/DefinitionsFactoryUtil.java filter/TilesFilter.java

2006-12-12 Thread apetrelli

Author: apetrelli
Date: Tue Dec 12 04:58:28 2006
New Revision: 486121

URL: http://svn.apache.org/viewvc?view=rev&rev=486121
Log:
Moved DefinitionsFactory reload in a utility class.

Added:

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java
   (with props)
Modified:

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java

Added: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java?view=auto&rev=486121
==
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java
 (added)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java
 Tue Dec 12 04:58:28 2006
@@ -0,0 +1,66 @@
+/*
+ * $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.
+ *
+ */
+
+package org.apache.tiles.definition.util;
+
+import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
+import org.apache.tiles.definition.DefinitionsFactory;
+import org.apache.tiles.definition.DefinitionsFactoryException;
+import org.apache.tiles.definition.ReloadableDefinitionsFactory;
+import org.apache.tiles.impl.BasicTilesContainer;
+
+/**
+ * Various [EMAIL PROTECTED] DefinitionsFactory} utilities.
+ *
+ * @version $Rev$ $Date$
+ */
+public class DefinitionsFactoryUtil {
+
+/**
+ * Private constructor to avoid instatiation.
+ */
+private DefinitionsFactoryUtil() {
+}
+
+/**
+ * Reloads the definitions factory content, if necessary.
+ *
+ * @param context The context object to use
+ * @throws DefinitionsFactoryException If something goes wrong during
+ * reload.
+ */
+public static void reloadDefinitionsFactory(Object context)
+throws DefinitionsFactoryException {
+TilesContainer container = TilesAccess.getContainer(context);
+if (container instanceof BasicTilesContainer) {
+BasicTilesContainer basic = (BasicTilesContainer) container;
+DefinitionsFactory factory = basic.getDefinitionsFactory();
+if (factory instanceof ReloadableDefinitionsFactory) {
+ReloadableDefinitionsFactory rFactory = 
(ReloadableDefinitionsFactory) factory;
+if (rFactory.refreshRequired()) {
+rFactory.refresh();
+}
+}
+}
+}
+}

Propchange: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java
--
svn:eol-style = native

Propchange: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java
--
svn:keywords = Date Author Id Revision HeadURL

Modified: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java?view=diff&rev=486121&r1=486120&r2=486121
==
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
 Tue Dec 12 04:58:28 2006
@@ -28,6 +28,7 @@
 import org.apache.tiles.access.TilesAccess;
 import org.apache.tiles.definition.DefinitionsFactory;
 import org.apache.tiles.definition.ReloadableDefinitionsFactory;
+import org.apache.tiles.definition.util.DefinitionsFactoryUtil;
 import org.apache.tiles.impl.BasicTilesContainer;
 import org.apache.tiles.servlet.TilesServlet;
 
@@ -67,17 +68,8 @@
 throws IOException, ServletException {

svn commit: r486478 - /struts/struts2/trunk/pom.xml

2006-12-12 Thread wsmoak

Author: wsmoak
Date: Tue Dec 12 19:19:26 2006
New Revision: 486478

URL: http://svn.apache.org/viewvc?view=rev&rev=486478
Log:
Use the latest released struts-master pom.
Remove the distribution management repository as it is inherited from 
struts-master.
Disable releases on the snapshot repository as releases are staged elsewhere.
WW-1483

Modified:
struts/struts2/trunk/pom.xml

Modified: struts/struts2/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?view=diff&rev=486478&r1=486477&r2=486478
==
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Tue Dec 12 19:19:26 2006
@@ -26,7 +26,7 @@

   org.apache.struts
   struts-master
-  3
+  4

 
 4.0.0
@@ -63,11 +63,6 @@
 
 
 
-
-   apache.snapshots
-   Apache Maven Repository (Snapshots and Test Builds)
-   
scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
-
 
apache.snapshots
false
@@ -274,7 +269,7 @@
 apache.snapshots
 Apache Maven Repository (Snapshots and Test Builds)
 http://people.apache.org/repo/m2-snapshot-repository
-true
+false
 true

svn commit: r486508 - in /struts/struts2/trunk: apps/showcase/ core/ core/src/main/java/org/apache/struts2/components/ core/src/main/java/org/apache/struts2/config/ core/src/main/java/org/apache/strut

2006-12-12 Thread mrdon

Author: mrdon
Date: Tue Dec 12 22:19:43 2006
New Revision: 486508

URL: http://svn.apache.org/viewvc?view=rev&rev=486508
Log:
Moved continuations support into a new plugin
WW-1548 XW-453

Added:
struts/struts2/trunk/plugins/continuations/
struts/struts2/trunk/plugins/continuations/pom.xml
struts/struts2/trunk/plugins/continuations/src/
struts/struts2/trunk/plugins/continuations/src/main/
struts/struts2/trunk/plugins/continuations/src/main/java/
struts/struts2/trunk/plugins/continuations/src/main/java/org/
struts/struts2/trunk/plugins/continuations/src/main/java/org/apache/
struts/struts2/trunk/plugins/continuations/src/main/java/org/apache/struts2/

struts/struts2/trunk/plugins/continuations/src/main/java/org/apache/struts2/continuations/

struts/struts2/trunk/plugins/continuations/src/main/java/org/apache/struts2/continuations/ContinuationsActionEventListener.java

struts/struts2/trunk/plugins/continuations/src/main/java/org/apache/struts2/continuations/ContinuationsClassLoader.java

struts/struts2/trunk/plugins/continuations/src/main/java/org/apache/struts2/continuations/ContinuationsExtraParameterProvider.java

struts/struts2/trunk/plugins/continuations/src/main/java/org/apache/struts2/continuations/NonCloningContinuableObject.java

struts/struts2/trunk/plugins/continuations/src/main/java/org/apache/struts2/continuations/StrutsContinuationConfig.java
struts/struts2/trunk/plugins/continuations/src/main/resources/

struts/struts2/trunk/plugins/continuations/src/main/resources/struts-plugin.xml
Modified:
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/core/pom.xml

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
struts/struts2/trunk/plugins/pom.xml

struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java

Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?view=diff&rev=486508&r1=486507&r2=486508
==
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Tue Dec 12 22:19:43 2006
@@ -64,6 +64,12 @@
 
 
 org.apache.struts
+struts2-continuations-plugin
+${pom.version}
+
+
+
+org.apache.struts
 struts2-codebehind-plugin
 ${pom.version}
 
@@ -120,11 +126,6 @@
  myfaces-api
  1.1.2
   
-  
- org.rifers
- rife-continuations
- 0.0.2
- 
  
  commons-fileupload
  commons-fileupload

Modified: struts/struts2/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=486508&r1=486507&r2=486508
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Tue Dec 12 22:19:43 2006
@@ -305,12 +305,6 @@
 
 
 
-  
- org.rifers
- rife-continuations
- 0.0.2
- true
- 
  
 
 jmock

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java?view=diff&rev=486508&r1=486507&r2=486508
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java 
Tue Dec 12 22:19:43 2006
@@ -42,7 +42,6 @@
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.XWorkContinuationConfig;
 
 /**
  * 
@@ -141,7 +140,8 @@
 protected String portletUrlType;
 protected String anchor;
 protected String urlIncludeParams;
-
+protected ExtraParameterProvider extraParameterProvider;
+
 public URL(ValueStack stack, HttpServletRequest req, HttpServletResponse 
res) {
 super(stack);
 this.req = req;
@@ -152,6 +152,11 @@
 public void setUrlIncludeParams(String urlIncludeParams) {
 this.urlIncludeParams = urlIncludeParams;
 }
+
+@Inject(required=false)
+public void setExtraParameterProvider(ExtraParameterProvider provider) {
+this.extraParameterProvider = prov

[CONF] Confluence Changes in the last 24 hours

svn commit: r486112 [2/2] - in /struts/struts1/trunk/tiles2: ./ src/main/java/org/apache/struts/tiles/ src/main/java/org/apache/struts/tiles/actions/ src/main/java/org/apache/struts/tiles/beans/ src/m

svn commit: r486113 - in /struts/struts1/trunk/tiles2/src/test/java/org/apache/struts: tiles/ tiles2/ tiles2/CustomI18nFactorySet.java tiles2/TestTilesPlugin.java tiles2/config/

svn commit: r486114 - /struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/

svn commit: r486115 - /struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/

svn commit: r486116 - in /struts/struts1/trunk/tiles2/src/main/resources/org/apache/struts: tiles/ tiles2/

svn commit: r486123 - /struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java

svn commit: r486120 - /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/

svn commit: r486121 - in /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles: definition/util/DefinitionsFactoryUtil.java filter/TilesFilter.java

svn commit: r486478 - /struts/struts2/trunk/pom.xml

svn commit: r486508 - in /struts/struts2/trunk: apps/showcase/ core/ core/src/main/java/org/apache/struts2/components/ core/src/main/java/org/apache/struts2/config/ core/src/main/java/org/apache/strut

11 matches

Site Navigation

Mail list logo

Footer information