svn commit: r450811 - in /struts/sandbox/trunk/tiles/tiles-test/src/main/webapp: WEB-INF/tiles-defs.xml index.jsp testinsertdefinition_composite.jsp testinsertdefinition_composite_tags.jsp testinsertd
Author: apetrelli Date: Thu Sep 28 04:41:52 2006 New Revision: 450811 URL: http://svn.apache.org/viewvc?view=rev&rev=450811 Log: Added test links for definitions that contain other definitions Added: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp Modified: 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-test/src/main/webapp/WEB-INF/tiles-defs.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml?view=diff&rev=450811&r1=450810&r2=450811 == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml (original) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml Thu Sep 28 04:41:52 2006 @@ -21,10 +21,22 @@ + + + + + + + + + + + + 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=450811&r1=450810&r2=450811 == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp Thu Sep 28 04:41:52 2006 @@ -30,11 +30,13 @@ Test Insert Configured Definition with no type specified Test Insert Configured Definition with an overridden content Test Insert Configured Definition with an inline content +Test Insert Configured Definition that contains another definition inside Test Put Tag Test importAttribute Tag Currently not working tests -Currently all the tests work. +Test Insert Definition that contains another definition inside using JSP tags +Test Insert Definition that contains another definition inside using JSP tags without types Added: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp?view=auto&rev=450811 == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp (added) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp Thu Sep 28 04:41:52 2006 @@ -0,0 +1,3 @@ +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> + + Added: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp?view=auto&rev=450811 == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp (added) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp Thu Sep 28 04:41:52 2006 @@ -0,0 +1,13 @@ +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> + + + + + + + + + + + + Added: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp?view=auto&rev=450811 == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp (added) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp Thu Sep 28 04:41:52 2006 @@ -0,0 +1,13 @@ +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> + + + + + + + + + + + +
svn commit: r450815 - in /struts/sandbox/trunk/tiles/tiles-test/src/main/webapp: testinsertdefinition_composite_tags.jsp testinsertdefinition_composite_tags_notype.jsp
Author: apetrelli Date: Thu Sep 28 04:49:36 2006 New Revision: 450815 URL: http://svn.apache.org/viewvc?view=rev&rev=450815 Log: Corrected reference to the inner definition Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp?view=diff&rev=450815&r1=450814&r2=450815 == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp Thu Sep 28 04:49:36 2006 @@ -8,6 +8,6 @@ - + Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp?view=diff&rev=450815&r1=450814&r2=450815 == --- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp Thu Sep 28 04:49:36 2006 @@ -8,6 +8,6 @@ - +
svn commit: r450909 - /struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs
Author: husted
Date: Thu Sep 28 09:03:13 2006
New Revision: 450909
URL: http://svn.apache.org/viewvc?view=rev&rev=450909
Log:
Add stack trace to unit test failures.
Modified:
struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs?view=diff&rev=450909&r1=450908&r2=450909
==
--- struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs Thu Sep 28
09:03:13 2006
@@ -94,6 +94,16 @@
}
return found;
}
+
+ protected void FaultText(Exception fault)
+ {
+ StringBuilder text = new StringBuilder("[");
+ text.Append(fault.Message);
+ text.Append("] ");
+ text.Append(fault.Source);
+ text.Append(fault.StackTrace);
+ Assert.Fail(text.ToString());
+ }
///
/// Convenience method to confirm that no Exception was caught.
@@ -102,9 +112,20 @@
///
public void AssertNoFault(IRequestContext context)
{
- bool hasFault = context.HasFault;
- if (hasFault)
- Assert.Fail(context.Fault.Message);
+ if (context.HasFault)
+ {
+ FaultText(context.Fault);
+ }
+ }
+
+ ///
+ /// Convenience method to confirm that no Exception was caught.
+ ///
+ /// Helper under test
+ ///
+ public void AssertNoFault(IViewHelper helper )
+ {
+ FaultText(helper.Fault);
}
///
@@ -149,9 +170,7 @@
///
public void AssertNominal(IViewHelper helper)
{
- bool hasFault = helper.HasFault;
- if (hasFault)
- Assert.Fail(helper.Fault.Message);
+ AssertNoFault(helper);
bool hasAlerts = helper.HasAlerts;
if (hasAlerts)
svn commit: r450910 - /struts/sandbox/trunk/overdrive/Agility/Core/Chain.cs
Author: husted
Date: Thu Sep 28 09:03:51 2006
New Revision: 450910
URL: http://svn.apache.org/viewvc?view=rev&rev=450910
Log:
Resharper tweaks
Modified:
struts/sandbox/trunk/overdrive/Agility/Core/Chain.cs
Modified: struts/sandbox/trunk/overdrive/Agility/Core/Chain.cs
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Agility/Core/Chain.cs?view=diff&rev=450910&r1=450909&r2=450910
==
--- struts/sandbox/trunk/overdrive/Agility/Core/Chain.cs (original)
+++ struts/sandbox/trunk/overdrive/Agility/Core/Chain.cs Thu Sep 28 09:03:51
2006
@@ -123,7 +123,7 @@
// or throws an exception
bool saveResult = false;
Exception saveException = null;
- int i = 0;
+ int i;
int n = commands.Length;
;
for (i = 0; i < n; i++)
@@ -146,7 +146,7 @@
i--;
}
bool handled = false;
- bool result = false;
+ bool result;
for (int j = i; j >= 0; j--)
{
if (commands[j] is IFilter)
@@ -160,7 +160,7 @@
}
catch (Exception e)
{
- e = e; // Silently ignore
+ if (e == null) throw (e); //
Silently ignore
}
}
}
[Struts Wiki] Update of "StrutsUpgradeNotes12to13" by WendySmoak
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by WendySmoak: http://wiki.apache.org/struts/StrutsUpgradeNotes12to13 The comment on the change is: Note the removal of DataSource -- Removed the contextRelative attribute of the forward element. === 5.2 Classes === + - ActionError has been removed. Use ActionMessage instead. + * ActionError has been removed. Use ActionMessage instead. + * DataSourceConfig has been removed. === 5.3 Methods and properties === ||Class||Member||Comments|| ||Action||defaultLocale||Use Locale.getDefault directly.|| + ||Action||getDataSource(request), getDataSource(request,key)|| FIXME || ||Action||saveErrors(HttpServletRequest request, ActionErrors errors)||Use saveErrors(HttpServletRequest, ActionMessages) instead.|| ||ActionErrors||GLOBAL_ERROR||Use ActionMessages.GLOBAL_MESSAGE instead.|| ||ActionErrors||add||Use add(String, ActionMessage) instead.||
svn commit: r450976 - in /struts/sandbox/trunk/overdrive/Nexus: Core/RequestCommand.cs Core/Validators/ProcessorCommand.cs Extras/Spring/Catalog.cs Test/BaseNexusTest.cs
Author: husted
Date: Thu Sep 28 12:21:57 2006
New Revision: 450976
URL: http://svn.apache.org/viewvc?view=rev&rev=450976
Log:
Fixes to accomdate recent improvements to the ID and RelatedID handling.
Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs
struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs
struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs?view=diff&rev=450976&r1=450975&r2=450976
==
--- struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs Thu Sep 28
12:21:57 2006
@@ -69,7 +69,10 @@
public virtual IList RequiredIDs
{
- get { return _RequiredIDs; }
+ get
+ {
+ return _RequiredIDs;
+ }
set { _RequiredIDs = value; }
}
@@ -99,7 +102,12 @@
public virtual IList RelatedIDs
{
- get { return _RelatedIDs; }
+ get
+ {
+ if (_RelatedIDs==null)
+ _RelatedIDs = new ArrayList();
+ return _RelatedIDs;
+ }
set { _RelatedIDs = value; }
}
Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs?view=diff&rev=450976&r1=450975&r2=450976
==
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs
(original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs
Thu Sep 28 12:21:57 2006
@@ -192,10 +192,11 @@
IDictionary combined = new Hashtable();
IList relatedIDs = context.CommandBin.RelatedIDs; //
outer list
// Add Command ID to related list (since we
store outcome under our own ID)
+ // This code relies on RelatedIDs being lazily
instantiated.
string id = context.CommandBin.ID;
bool found_self = relatedIDs.Contains(id);
if (!found_self) relatedIDs.Add(id);
- if (relatedIDs != null) foreach (string i in
relatedIDs) combined[i] = i;
+ foreach (string i in relatedIDs) combined[i] = i;
IList requiredIDs = context.CommandBin.RequiredIDs; //
inner list
if (requiredIDs != null) foreach (string i in
requiredIDs) combined[i] = i;
return combined.Keys;
Modified: struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs?view=diff&rev=450976&r1=450975&r2=450976
==
--- struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs Thu Sep 28
12:21:57 2006
@@ -184,7 +184,7 @@
public IRequestContext GetRequestContext(IRequestCommand
command)
{
- IRequestContext context = null;
+ IRequestContext context;
try
{
context = command.NewContext();
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs?view=diff&rev=450976&r1=450975&r2=450976
==
--- struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs Thu Sep 28
12:21:57 2006
@@ -125,7 +125,7 @@
///
public void AssertNoFault(IViewHelper helper )
{
- FaultText(helper.Fault);
+ if (helper.HasFault) FaultText(helper.Fault) ;
}
///
@@ -266,6 +266,16 @@
}
///
+ /// Virtual method for populating a context
+
[Struts Wiki] Update of "StrutsUpgradeNotes12to13" by WendySmoak
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by WendySmoak: http://wiki.apache.org/struts/StrutsUpgradeNotes12to13 The comment on the change is: More DTD changes -- == 5 Deprecations which have been removed == === 5.1 struts-config_1_3.dtd === + - Removed the contextRelative attribute of the forward element. + * Removed the contextRelative attribute of the element. + * Removed the dynamic attribute of the element + * Removed the and elements === 5.2 Classes ===
[Struts Wiki] Update of "StrutsUpgradeNotes12to13" by WendySmoak
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by WendySmoak: http://wiki.apache.org/struts/StrutsUpgradeNotes12to13 The comment on the change is: Added a link to colorized "diff -u" style output between the 1.2 and 1.3 DTDs -- === 5.1 struts-config_1_3.dtd === + View differences between the 1.2 and 1.3 DTDs [http://people.apache.org/~wsmoak/struts/struts-config-diff.html here]. + * Removed the contextRelative attribute of the element. * Removed the dynamic attribute of the element * Removed the and elements
svn commit: r451096 - /struts/struts2/trunk/apps/pom.xml
Author: jmitchell Date: Thu Sep 28 20:11:01 2006 New Revision: 451096 URL: http://svn.apache.org/viewvc?view=rev&rev=451096 Log: Add license (sorry, I couldn't find a suitable JIRA #) Modified: struts/struts2/trunk/apps/pom.xml Modified: struts/struts2/trunk/apps/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?view=diff&rev=451096&r1=451095&r2=451096 == --- struts/struts2/trunk/apps/pom.xml (original) +++ struts/struts2/trunk/apps/pom.xml Thu Sep 28 20:11:01 2006 @@ -1,4 +1,24 @@ + + http://maven.apache.org/POM/4.0.0"; 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";> 4.0.0
svn commit: r451137 - in /struts/struts2/trunk/core: ./ src/main/java/org/apache/struts2/tiles/ src/main/java/org/apache/struts2/views/tiles/
Author: mrdon
Date: Thu Sep 28 22:53:44 2006
New Revision: 451137
URL: http://svn.apache.org/viewvc?view=rev&rev=451137
Log:
Updated tiles dependency to 2.0-snapshot, added support for tiles and
freemarker integration
WW-1418 WW-1450
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/tiles/
struts/struts2/trunk/core/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/tiles/StrutsTilesUtilImpl.java
Modified:
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=451137&r1=451136&r2=451137
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Thu Sep 28 22:53:44 2006
@@ -204,7 +204,7 @@
org.apache.struts.tiles
tiles-core
-0.2-SNAPSHOT
+2.0-SNAPSHOT
true
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java?view=auto&rev=451137
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java
(added)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java
Thu Sep 28 22:53:44 2006
@@ -0,0 +1,61 @@
+/*
+ * $Id: StrutsSpringObjectFactory.java 439747 2006-09-03 09:22:46Z mrdon $
+ *
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts2.tiles;
+
+import org.apache.tiles.listener.TilesListener;
+import org.apache.tiles.TilesUtilImpl;
+import org.apache.tiles.TilesUtil;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContext;
+
+/**
+ * Custom TilesListener which can be used to allow freemarker
+ * invocation from tiles components.
+ *
+ * @version $Rev: 397992 $ $Date$
+ */
+public class StrutsTilesListener extends TilesListener {
+
+/**
+ * The key used to identify the freemarker mask.
+ */
+public static final String MASK_INIT_PARAM = "freemarker-mask";
+
+/**
+ * Configured mask;
+ */
+private String mask;
+
+/**
+ * Initialize the tiles system, overriding the TilesUtilImpl
+ * @param servletContextEvent
+ */
+public void contextInitialized(ServletContextEvent servletContextEvent) {
+ServletContext context = servletContextEvent.getServletContext();
+mask = context.getInitParameter(MASK_INIT_PARAM);
+
+if(mask == null) {
+mask = ".ftl";
+}
+
+TilesUtilImpl tilesUtil = new StrutsTilesUtilImpl();
+TilesUtil.setTilesUtil(tilesUtil);
+super.contextInitialized(servletContextEvent);
+}
+}
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/tiles/StrutsTilesUtilImpl.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/tiles/StrutsTilesUtilImpl.java?view=auto&rev=451137
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/tiles/StrutsTilesUtilImpl.java
(added)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/tiles/StrutsTilesUtilImpl.java
Thu Sep 28 22:53:44 2006
@@ -0,0 +1,96 @@
+/*
+ * $Id: StrutsSpringObjectFactory.java 439747 2006-09-03 09:22:46Z mrdon $
+ *
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts2
svn commit: r451138 - in /struts/struts2/trunk: core/ core/src/main/java/org/apache/struts2/tiles/ core/src/main/java/org/apache/struts2/views/tiles/ plugins/tiles/ plugins/tiles/src/ plugins/tiles/sr
Author: mrdon Date: Thu Sep 28 23:01:40 2006 New Revision: 451138 URL: http://svn.apache.org/viewvc?view=rev&rev=451138 Log: Moving tiles into its own plugin WW-1457 Added: struts/struts2/trunk/plugins/tiles/ struts/struts2/trunk/plugins/tiles/pom.xml struts/struts2/trunk/plugins/tiles/src/ struts/struts2/trunk/plugins/tiles/src/main/ struts/struts2/trunk/plugins/tiles/src/main/java/ struts/struts2/trunk/plugins/tiles/src/main/java/org/ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/ - copied from r451137, struts/struts2/trunk/core/src/main/java/org/apache/struts2/tiles/ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/ - copied from r451134, struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/tiles/ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java - copied unchanged from r451137, struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/tiles/TilesResult.java Removed: struts/struts2/trunk/core/src/main/java/org/apache/struts2/tiles/ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/tiles/ Modified: struts/struts2/trunk/core/pom.xml Modified: struts/struts2/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=451138&r1=451137&r2=451138 == --- struts/struts2/trunk/core/pom.xml (original) +++ struts/struts2/trunk/core/pom.xml Thu Sep 28 23:01:40 2006 @@ -200,14 +200,7 @@ true - - -org.apache.struts.tiles -tiles-core -2.0-SNAPSHOT -true - - + commons-digester commons-digester 1.7 Added: struts/struts2/trunk/plugins/tiles/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/pom.xml?view=auto&rev=451138 == --- struts/struts2/trunk/plugins/tiles/pom.xml (added) +++ struts/struts2/trunk/plugins/tiles/pom.xml Thu Sep 28 23:01:40 2006 @@ -0,0 +1,36 @@ + +http://maven.apache.org/POM/4.0.0"; 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";> +4.0.0 + +org.apache.struts +struts2-plugins +2.0.1-SNAPSHOT + +org.apache.struts +struts2-tiles-plugin +jar +Struts 2 Tiles Plugin + + + +apache-site + scp://people.apache.org/www/struts.apache.org/2.x/plugins/tiles + + + + + +org.apache.struts.tiles +tiles-core +2.0-SNAPSHOT + + +javax.servlet +jsp-api +2.0 +provided + + + +
svn commit: r451139 - /struts/struts2/trunk/plugins/pom.xml
Author: mrdon Date: Thu Sep 28 23:07:49 2006 New Revision: 451139 URL: http://svn.apache.org/viewvc?view=rev&rev=451139 Log: Added plugins to parent pom WW-1457 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=451139&r1=451138&r2=451139 == --- struts/struts2/trunk/plugins/pom.xml (original) +++ struts/struts2/trunk/plugins/pom.xml Thu Sep 28 23:07:49 2006 @@ -17,8 +17,11 @@ jasperreports jfreechart jsf +config-browser +plexus +sitemesh +tiles - apache-site
svn commit: r451141 - /struts/struts2/trunk/assembly/pom.xml
Author: mrdon
Date: Thu Sep 28 23:16:46 2006
New Revision: 451141
URL: http://svn.apache.org/viewvc?view=rev&rev=451141
Log:
Updating assembly for plugins
WW-1457
Modified:
struts/struts2/trunk/assembly/pom.xml
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?view=diff&rev=451141&r1=451140&r2=451141
==
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Thu Sep 28 23:16:46 2006
@@ -140,11 +140,61 @@
struts2-core
${version}
+
org.apache.struts
-struts2-extras
+struts2-config-browser-plugin
${version}
+
+
+org.apache.struts
+struts2-jasperreports-plugin
+${version}
+
+
+
+org.apache.struts
+struts2-jfreechart-plugin
+${version}
+
+
+
+org.apache.struts
+struts2-jsf-plugin
+${version}
+
+
+
+org.apache.struts
+struts2-pell-multipart-plugin
+${version}
+
+
+
+org.apache.struts
+struts2-plexus-plugin
+${version}
+
+
+
+org.apache.struts
+struts2-sitemesh-plugin
+${version}
+
+
+
+org.apache.struts
+struts2-struts1-plugin
+${version}
+
+
+
+org.apache.struts
+struts2-tiles-plugin
+${version}
+
+
