[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - OpenJPA (openjpa) http://cwiki.apache.org/confluence/display/openjpa | |-Pages Added or Edited in This Space |-- Releasing OpenJPA was created by mprudhom (11:08 AM). | http://cwiki.apache.org/confluence/display/openjpa/Releasing+OpenJPA Apache Geronimo Development (GMOxDEV) http://cwiki.apache.org/confluence/display/GMOxDEV | |-Pages Added or Edited in This Space |-- Building Apache Geronimo with Maven 2 was last edited by jdillon (06:51 PM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Building+Apache+Geronimo+with+Maven+2 Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- Building Felix was last edited by [EMAIL PROTECTED] (07:57 PM). | http://cwiki.apache.org/confluence/display/FELIX/Building+Felix |-- Bundle Plugin for Maven (BND) was last edited by [EMAIL PROTECTED] (07:49 PM). | http://cwiki.apache.org/confluence/display/FELIX/Bundle+Plugin+for+Maven+%28BND%29 |-- Apache Felix Commons was last edited by [EMAIL PROTECTED] (07:46 PM). | http://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Commons Apache Directory Server v1.1 Documentation (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- ApacheDS v1.5 Developer's Guide was last edited by elecharny (02:42 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/ApacheDS+v1.5+Developer%27s+Guide Apache Geronimo v1.1 (GMOxDOC11) http://cwiki.apache.org/confluence/display/GMOxDOC11 | |-Pages Added or Edited in This Space |-- Aplicación EJB ejemplo was last edited by [EMAIL PROTECTED] (07:35 PM). | http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=23870 Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- Home was last edited by [EMAIL PROTECTED] (08:33 PM). | http://cwiki.apache.org/confluence/display/WW/Home |-- JSP Tags was last edited by wsmoak (11:50 AM). | http://cwiki.apache.org/confluence/display/WW/JSP+Tags |-- JSP was last edited by wsmoak (10:22 AM). | http://cwiki.apache.org/confluence/display/WW/JSP |-- Ready, Set, Go! was last edited by wsmoak (09:31 AM). | http://cwiki.apache.org/confluence/display/WW/Ready%2C+Set%2C+Go%21 |-- How can we change which methods are excused from validation was created by husted (05:40 AM). | http://cwiki.apache.org/confluence/display/WW/How+can+we+change+which+methods+are+excused+from+validation |-- How can we create our Action objects from the Spring configuration was created by husted (05:02 AM). | http://cwiki.apache.org/confluence/display/WW/How+can+we+create+our+Action+objects+from+the+Spring+configuration |-- Why would we want to create Action objects from the Spring configuration was created by husted (05:05 AM). | http://cwiki.apache.org/confluence/display/WW/Why+would+we+want+to+create+Action+objects+from+the+Spring+configuration |-- FAQs was last edited by husted (05:06 AM). | http://cwiki.apache.org/confluence/display/WW/FAQs |-- Why is my action returning "input" when the form is filled out correctly was created by husted (04:51 AM). | http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=29117 |-- Interceptors was last edited by husted (04:47 AM). | http://cwiki.apache.org/confluence/display/WW/Interceptors |-- How do we configure an Interceptor to be used with every Action was created by husted (04:46 AM). | http://cwiki.apache.org/confluence/display/WW/How+do+we+configure+an+Interceptor+to+be+used+with+every+Action Apache Directory Development (DIRxDEV) http://cwiki.apache.org/confluence/display/DIRxDEV | |-Pages Added or Edited in This Space |-- Coding standards was last edited by elecharny (02:50 PM). | http://cwiki.apache.org/confluence/display/DIRxDEV/Coding+standards Apache Struts 2 Wiki (S2WIKI) http://cwiki.apache.org/confluence/display/S2WIKI | |-Pages Added or Edited in This Space |-- Companies that provide Struts 2 support was last edited by [EMAIL PROTECTED] (07:57 PM). | http://cwiki.apache.org/confluence/display/S2WIKI/Companies+that+provide+Struts+2+support - 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/conflu
svn commit: r472880 - /struts/sandbox/trunk/tiles/tiles-core/src/site/site.xml
Author: apetrelli Date: Thu Nov 9 04:38:14 2006 New Revision: 472880 URL: http://svn.apache.org/viewvc?view=rev&rev=472880 Log: SB-78 ASF source header addition for the last file that missed it. Modified: struts/sandbox/trunk/tiles/tiles-core/src/site/site.xml Modified: struts/sandbox/trunk/tiles/tiles-core/src/site/site.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/site/site.xml?view=diff&rev=472880&r1=472879&r2=472880 == --- struts/sandbox/trunk/tiles/tiles-core/src/site/site.xml (original) +++ struts/sandbox/trunk/tiles/tiles-core/src/site/site.xml Thu Nov 9 04:38:14 2006 @@ -1,4 +1,24 @@ +
svn commit: r472908 - in /struts/sandbox/trunk/overdrive/Nexus: Extras/Extras.csproj Test/Test.csproj Web/Web.csproj
Author: husted Date: Thu Nov 9 06:21:24 2006 New Revision: 472908 URL: http://svn.apache.org/viewvc?view=rev&rev=472908 Log: WNE-88 Add swtiches so that step and ticket types can be changed. Modified: struts/sandbox/trunk/overdrive/Nexus/Extras/Extras.csproj struts/sandbox/trunk/overdrive/Nexus/Test/Test.csproj struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj Modified: struts/sandbox/trunk/overdrive/Nexus/Extras/Extras.csproj URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Nexus/Extras/Extras.csproj?view=diff&rev=472908&r1=472907&r2=472908 == --- struts/sandbox/trunk/overdrive/Nexus/Extras/Extras.csproj (original) +++ struts/sandbox/trunk/overdrive/Nexus/Extras/Extras.csproj Thu Nov 9 06:21:24 2006 @@ -80,6 +80,11 @@ HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll" /> + - Modified: struts/sandbox/trunk/overdrive/Nexus/Test/Test.csproj URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Nexus/Test/Test.csproj?view=diff&rev=472908&r1=472907&r2=472908 == --- struts/sandbox/trunk/overdrive/Nexus/Test/Test.csproj (original) +++ struts/sandbox/trunk/overdrive/Nexus/Test/Test.csproj Thu Nov 9 06:21:24 2006 @@ -86,16 +86,6 @@ AssemblyFolderKey = "hklm\dn\nunit.framework" /> - - + + Modified: struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj?view=diff&rev=472908&r1=472907&r2=472908 == --- struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj (original) +++ struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj Thu Nov 9 06:21:24 2006 @@ -90,24 +90,24 @@ HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll" /> + -
svn commit: r472913 - in /struts/sandbox/trunk/tiles: tiles-api/src/main/java/org/apache/tiles/mgmt/ tiles-core/src/main/java/org/apache/tiles/definition/ tiles-core/src/main/java/org/apache/tiles/def
Author: ddewolf
Date: Thu Nov 9 06:29:02 2006
New Revision: 472913
URL: http://svn.apache.org/viewvc?view=rev&rev=472913
Log:
Beginning to flush out the mutable container api
Added:
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
(with props)
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
(with props)
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
(with props)
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
(with props)
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinition.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTagSupport.java
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp
Added:
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java?view=auto&rev=472913
==
---
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
(added)
+++
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
Thu Nov 9 06:29:02 2006
@@ -0,0 +1,39 @@
+/*
+ * 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.mgmt;
+
+import org.apache.tiles.TilesContainer;
+import org.apache.tiles.TilesException;
+
+/**
+ * Defines a mutable version of the TilesContainer.
+ *
+ * @since Tiles 2.0
+ * @version $Rev$
+ */
+public interface MutableTilesContainer extends TilesContainer {
+
+/**
+ * Register a new definition with the container.
+ * @param definition
+ */
+void register(TileDefinition definition) throws TilesException;
+
+}
Propchange:
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
--
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
--
svn:keywords = Id Author Date Rev
Added:
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java?view=auto&rev=472913
==
---
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
(added)
+++
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
Thu Nov 9 06:29:02 2006
@@ -0,0 +1,174 @@
+/*
+ * 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 e
svn commit: r472951 - in /struts/sandbox/trunk/tiles: ./ tiles-api/ tiles-core/ tiles-documentation/ tiles-test/
Author: apetrelli Date: Thu Nov 9 07:33:32 2006 New Revision: 472951 URL: http://svn.apache.org/viewvc?view=rev&rev=472951 Log: SB-78 Added and modified NOTICE.txt files; added LICENSE.txt files where needed. Added NOTICE.txt and LICENSE.txt to tiles-test/pom.xml Added: struts/sandbox/trunk/tiles/LICENSE.txt struts/sandbox/trunk/tiles/NOTICE.txt struts/sandbox/trunk/tiles/tiles-api/LICENSE.txt struts/sandbox/trunk/tiles/tiles-api/NOTICE.txt struts/sandbox/trunk/tiles/tiles-documentation/LICENSE.txt struts/sandbox/trunk/tiles/tiles-documentation/NOTICE.txt struts/sandbox/trunk/tiles/tiles-test/LICENSE.txt struts/sandbox/trunk/tiles/tiles-test/NOTICE.txt Modified: struts/sandbox/trunk/tiles/tiles-core/NOTICE.txt struts/sandbox/trunk/tiles/tiles-test/pom.xml Added: struts/sandbox/trunk/tiles/LICENSE.txt URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/LICENSE.txt?view=auto&rev=472951 == --- struts/sandbox/trunk/tiles/LICENSE.txt (added) +++ struts/sandbox/trunk/tiles/LICENSE.txt Thu Nov 9 07:33:32 2006 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare
svn commit: r472960 - /struts/sandbox/trunk/tiles/tiles-test/pom.xml
Author: apetrelli Date: Thu Nov 9 08:23:09 2006 New Revision: 472960 URL: http://svn.apache.org/viewvc?view=rev&rev=472960 Log: Added dependency to maven-war-plugin version 2.0.2-SNAPSHOT Modified: struts/sandbox/trunk/tiles/tiles-test/pom.xml Modified: struts/sandbox/trunk/tiles/tiles-test/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/pom.xml?view=diff&rev=472960&r1=472959&r2=472960 == --- struts/sandbox/trunk/tiles/tiles-test/pom.xml (original) +++ struts/sandbox/trunk/tiles/tiles-test/pom.xml Thu Nov 9 08:23:09 2006 @@ -67,7 +67,7 @@ org.apache.maven.plugins maven-war-plugin - 2.0.2 + 2.0.2-SNAPSHOT
svn commit: r472961 - in /struts/sandbox/trunk/tiles: tiles-core/src/main/java/org/apache/tiles/access/ tiles-core/src/main/java/org/apache/tiles/factory/ tiles-core/src/main/java/org/apache/tiles/imp
Author: ddewolf
Date: Thu Nov 9 08:23:57 2006
New Revision: 472961
URL: http://svn.apache.org/viewvc?view=rev&rev=472961
Log:
Adding initContainer and destroyContainer tags
Added:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DestroyContainerTag.java
(with props)
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/InitContainerTag.java
(contents, props changed)
- copied, changed from r472909,
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/InitDefinitionsTag.java
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinitcontainer.jsp
(with props)
Removed:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/InitDefinitionsTag.java
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/access/TilesAccess.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/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/taglib/ContainerTagSupport.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
struts/sandbox/trunk/tiles/tiles-core/src/main/resources/META-INF/tiles-core.tld
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/access/TilesAccess.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/access/TilesAccess.java?view=diff&rev=472961&r1=472960&r2=472961
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/access/TilesAccess.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/access/TilesAccess.java
Thu Nov 9 08:23:57 2006
@@ -48,6 +48,16 @@
public static void setContainer(Object context, TilesContainer container)
throws TilesException {
+
+if (container == null) {
+if(LOG.isInfoEnabled()) {
+LOG.info("Removing TilesContext for context: " +
context.getClass().getName());
+}
+removeAttribute(context, CONTAINER_ATTRIBUTE);
+}
+if (container != null && LOG.isInfoEnabled()) {
+LOG.info("Publishing TilesContext for context: " +
context.getClass().getName());
+}
setAttribute(context, CONTAINER_ATTRIBUTE, container);
}
@@ -59,16 +69,6 @@
return (TilesApplicationContext) getAttribute(context,
CONTEXT_ATTRIBUTE);
}
-/**
- * @param context
- * @param
- * @deprecated temporarily added for backwards compatibility.
- */
-public static void setApplicationContext(Object context,
TilesApplicationContext tilesContext)
-throws TilesException {
-setAttribute(context, CONTEXT_ATTRIBUTE, tilesContext);
-}
-
private static Object getAttribute(Object context, String attributeName) {
try {
Class contextClass = context.getClass();
@@ -91,4 +91,14 @@
}
}
+private static void removeAttribute(Object context, String name)
+throws TilesException {
+try {
+Class contextClass = context.getClass();
+Method attrMethod = contextClass.getMethod("removeAttribute",
String.class);
+attrMethod.invoke(context, name);
+} catch (Exception e) {
+throw new TilesException("Unable to remove attribute for specified
context: '" + context + "'");
+}
+}
}
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=472961&r1=472960&r2=472961
==
---
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
Thu Nov 9 08:23:57 2006
@@ -22,14 +22,16 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
-import org.apache.tiles.util.ClassUtil;
-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.Definiti
svn commit: r472975 - /struts/sandbox/trunk/tiles/pom.xml
Author: apetrelli Date: Thu Nov 9 08:55:08 2006 New Revision: 472975 URL: http://svn.apache.org/viewvc?view=rev&rev=472975 Log: Enabled snapshot plugin repositories 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=472975&r1=472974&r2=472975 == --- struts/sandbox/trunk/tiles/pom.xml (original) +++ struts/sandbox/trunk/tiles/pom.xml Thu Nov 9 08:55:08 2006 @@ -171,5 +171,12 @@ - + + +apache.snapshots +http://people.apache.org/repo/m2-snapshot-repository/ +true +false + +
svn commit: r472977 - in /struts/sandbox/trunk/tiles: tiles-api/src/main/java/org/apache/tiles/mgmt/ tiles-core/src/main/java/org/apache/tiles/impl/mgmt/ tiles-core/src/main/java/org/apache/tiles/tagl
Author: ddewolf
Date: Thu Nov 9 08:56:44 2006
New Revision: 472977
URL: http://svn.apache.org/viewvc?view=rev&rev=472977
Log:
Implementing definition tag. Very close to fixing all tags.
Removed:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTagSupport.java
Modified:
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java
Modified:
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java?view=diff&rev=472977&r1=472976&r2=472977
==
---
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
Thu Nov 9 08:56:44 2006
@@ -22,6 +22,7 @@
import org.apache.tiles.ComponentAttribute;
import java.util.Map;
+import java.util.HashMap;
/**
* Data transfer object used for registering new
@@ -57,6 +58,10 @@
*/
protected String preparer = null;
+
+public TileDefinition() {
+attributes = new HashMap();
+}
/**
* Access method for the name property.
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java?view=diff&rev=472977&r1=472976&r2=472977
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
Thu Nov 9 08:56:44 2006
@@ -20,7 +20,10 @@
package org.apache.tiles.impl.mgmt;
import org.apache.tiles.TilesException;
+import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.ComponentDefinition;
+import org.apache.tiles.definition.DefinitionsFactoryException;
+import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.impl.BasicTilesContainer;
import org.apache.tiles.mgmt.TileDefinition;
import org.apache.tiles.mgmt.MutableTilesContainer;
@@ -44,4 +47,19 @@
mgr.addDefinition(def);
}
+protected ComponentDefinition getDefinition(String definition,
+TilesRequestContext context)
+throws DefinitionsFactoryException {
+return mgr.getDefinition(definition, context);
+}
+
+
+public DefinitionsFactory getDefinitionsFactory() {
+return mgr.getFactory();
+}
+
+public void setDefinitionsFactory(DefinitionsFactory definitionsFactory) {
+super.setDefinitionsFactory(definitionsFactory);
+mgr.setFactory(definitionsFactory);
+}
}
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java?view=diff&rev=472977&r1=472976&r2=472977
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java
Thu Nov 9 08:56:44 2006
@@ -23,9 +23,13 @@
import org.apache.tiles.taglib.PutTag;
import org.apache.tiles.ComponentAttribute;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.TilesException;
+import org.apache.tiles.mgmt.MutableTilesContainer;
+import org.apache.tiles.mgmt.TileDefinition;
import org.apache.tiles.access.TilesAccess;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
import java.util.Map;
import java.util.HashMap;
@@ -36,34 +40,21 @@
*
* @version $Rev$ $Date$
*/
-public class DefinitionTag extends DefinitionTagSupport
+public class DefinitionTag extends TagSupport
implements PutTagParent {
-/* JSP Tag attributes */
-/**
- * TileDefinition identifier.
- */
-private String name = null;
-/**
- * Scope into which definition will be saved.
- */
-private String scope = null;
+private String name;
+private String template;
+private String extend;
+private String role;
+private String preparer
svn commit: r473011 - in /struts/sandbox/trunk/tiles: tiles-core/src/main/java/org/apache/tiles/definition/ tiles-core/src/main/java/org/apache/tiles/impl/mgmt/ tiles-core/src/main/java/org/apache/til
Author: ddewolf
Date: Thu Nov 9 10:36:37 2006
New Revision: 473011
URL: http://svn.apache.org/viewvc?view=rev&rev=473011
Log:
Fixing several jsp defined definition tests
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.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/impl/mgmt/DefinitionManager.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java?view=diff&rev=473011&r1=473010&r2=473011
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java
Thu Nov 9 10:36:37 2006
@@ -103,9 +103,12 @@
*/
public ComponentDefinition getDefinition(String name, Locale locale) {
ComponentDefinition definition = null;
-Map localeSpecificMap = (Map) localeSpecificDefinitions.get(locale);
-if (localeSpecificMap != null) {
-definition = (ComponentDefinition) localeSpecificMap.get(name);
+
+if (locale != null) {
+Map localeSpecificMap = localeSpecificDefinitions.get(locale);
+if (localeSpecificMap != null) {
+definition = (ComponentDefinition) localeSpecificMap.get(name);
+}
}
if (definition == null) {
@@ -156,13 +159,13 @@
}
public void resolveAttributeDependencies() {
-for (ComponentDefinition def: baseDefinitions.values()) {
+for (ComponentDefinition def : baseDefinitions.values()) {
Map attributes = def.getAttributes();
-for (ComponentAttribute attr: attributes.values()) {
+for (ComponentAttribute attr : attributes.values()) {
if (isDefinitionType(attr)) {
-ComponentDefinition subDef =
-getDefinitionByAttribute(attr);
-attr.setAttributes(subDef.getAttributes());
+ComponentDefinition subDef =
+getDefinitionByAttribute(attr);
+attr.setAttributes(subDef.getAttributes());
}
}
}
@@ -170,11 +173,11 @@
private boolean isDefinitionType(ComponentAttribute attr) {
boolean explicit = (attr.getType() != null &&
- (attr.getType().equalsIgnoreCase("definition") ||
+(attr.getType().equalsIgnoreCase("definition") ||
attr.getType().equalsIgnoreCase("instance")));
boolean implicit =
-attr.getType() == null &&
+attr.getType() == null &&
attr.getValue() != null &&
baseDefinitions.containsKey(attr.getValue().toString());
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java?view=diff&rev=473011&r1=473010&r2=473011
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
Thu Nov 9 10:36:37 2006
@@ -21,16 +21,21 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.tiles.TilesException;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.digester.DigesterDefinitionsReader;
import org.apache.tiles.util.ClassUtil;
-import org.apache.tiles.TilesException;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
/**
* [EMAIL PROTECTED] DefinitionsFactory DefinitionsFactory} implementation
@@ -127,10 +132,14 @@
throws DefinitionsFactoryException {
ComponentDefinitions d
svn commit: r473016 - in /struts/sandbox/trunk/tiles: tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java tiles-test/src/main/webapp/index.jsp
Author: ddewolf
Date: Thu Nov 9 10:47:09 2006
New Revision: 473016
URL: http://svn.apache.org/viewvc?view=rev&rev=473016
Log:
All selenium tests now pass, including definition tags that use the mutable
container
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java?view=diff&rev=473016&r1=473015&r2=473016
==
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
Thu Nov 9 10:47:09 2006
@@ -51,13 +51,20 @@
}
for(ComponentAttribute attr : definition.getAttributes().values()) {
-if(ComponentAttribute.DEFINITION.equals(attr.getType())) {
+if(isDefinition(attr)) {
ComponentDefinition d =
getDefinition(attr.getValue().toString(), null);
attr.setAttributes(d.getAttributes());
}
}
definitions.put(definition.getName(), definition);
+}
+
+private boolean isDefinition(ComponentAttribute attribute) throws
DefinitionsFactoryException {
+boolean explicit =
ComponentAttribute.DEFINITION.equals(attribute.getType());
+boolean implicit = attribute.getType() == null &&
+(getDefinition((String)attribute.getValue(), null)
!= null);
+return explicit || implicit;
}
private void validate(TileDefinition definition) {
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=473016&r1=473015&r2=473016
==
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp Thu Nov 9
10:47:09 2006
@@ -28,6 +28,8 @@
Tiles 2 Test Application
Currently working tests
+
+Standard Render/Attribute Tests
Test Insert Configured
Definition
Test Insert Configured
Definition with Preparer
Test Insert Configured
Classpath Definition
@@ -35,20 +37,19 @@
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 Put Tag using a servlet mapping as a
template
Test importAttribute Tag
Test importAttribute Tag with no
name
-Container Management Tags
+Mutable Container Tests
Test Initialize Container
Test Definition Tag
Test
Insert Definition that contains another definition inside (configured via
tiles-defs.xml) using JSP tags
Test Insert Definition
that contains another definition inside using JSP tags
-
-Currently not working tests
Test
Insert Definition that contains another definition inside (configured via
tiles-defs.xml) using JSP tags without types
Test Insert
Definition that contains another definition inside using JSP tags without
types
+
+Currently not working tests
svn commit: r473052 - /struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs
Author: husted
Date: Thu Nov 9 11:53:29 2006
New Revision: 473052
URL: http://svn.apache.org/viewvc?view=rev&rev=473052
Log:
Expose reset event so that peer controls can adjust their state.
Modified:
struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs?view=diff&rev=473052&r1=473051&r2=473052
==
--- struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs Thu Nov 9
11:53:29 2006
@@ -870,12 +870,22 @@
}
///
+ /// Signal that input was reset.
+ ///
+ ///
+ public event EventHandler View_Reset;
+
+ ///
/// Reset control values.
///
///
protected void reset_Click(object sender, EventArgs e)
{
Page_Reset();
+ if (View_Reset != null)
+ {
+ View_Reset(sender, e); // bubble it
+ }
}
///
svn commit: r473132 - /struts/maven/trunk/pom/pom.xml
Author: ddewolf Date: Thu Nov 9 15:08:12 2006 New Revision: 473132 URL: http://svn.apache.org/viewvc?view=rev&rev=473132 Log: use unique versions for snapshots Modified: struts/maven/trunk/pom/pom.xml Modified: struts/maven/trunk/pom/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/pom/pom.xml?view=diff&rev=473132&r1=473131&r2=473132 == --- struts/maven/trunk/pom/pom.xml (original) +++ struts/maven/trunk/pom/pom.xml Thu Nov 9 15:08:12 2006 @@ -343,7 +343,7 @@ scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository - false + true apache.snapshots Apache Development Snapshot Repository scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
svn commit: r473138 - in /struts/struts2/trunk: apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/ apps/showcase/src/main/resources/ apps/showcase/src/main/webapp/ apps/showcase/src/m
Author: ddewolf Date: Thu Nov 9 15:29:48 2006 New Revision: 473138 URL: http://svn.apache.org/viewvc?view=rev&rev=473138 Log: Updating tiles plugin to utilize new snapshot. Adding a tiles showcase Added: struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml (with props) struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/ struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp (with props) struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/header.jsp (with props) struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp (with props) struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java (with props) struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java - copied, changed from r473024, struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesUtilImpl.java Removed: struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesUtilImpl.java Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators.xml struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp struts/struts2/trunk/plugins/tiles/pom.xml struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java?view=diff&rev=473138&r1=473137&r2=473138 == --- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java (original) +++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java Thu Nov 9 15:29:48 2006 @@ -18,7 +18,12 @@ * specific language governing permissions and limitations * under the License. */ +package org.apache.struts2.showcase.fileupload; import com.opensymphony.xwork2.ActionSupport; + +import java.io.File; +import java.util.List; +import java.util.ArrayList; /** * Showcase action - multiple file upload using List Added: struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml?view=auto&rev=473138 == --- struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml (added) +++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml Thu Nov 9 15:29:48 2006 @@ -0,0 +1,23 @@ + + +http://struts.apache.org/dtds/struts-2.0.dtd";> + + + + + + +showcase.index +showcase.index + + + +/tiles/layout.jsp +/tiles/layout.jsp + + + + + Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml?view=diff&rev=473138&r1=473137&r2=473138 == --- struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml Thu Nov 9 15:29:48 2006 @@ -41,6 +41,8 @@ + + Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators.xml?view=diff&rev=473138&r1=473137&r2=473138 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators.xml Thu Nov 9 15:29:48 2006 @@ -16,6 +16,7 @@ /chat/ajax/* /hangman/ajax/* /nodecorate/* +/tiles/* Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators
