svn commit: r415116 - /struts/action2/trunk/apps/showcase/src/main/resources/tmjee/
Author: tmjee Date: Sun Jun 18 02:22:12 2006 New Revision: 415116 URL: http://svn.apache.org/viewvc?rev=415116&view=rev Log: WW-1349 - removed an unused directory accidently commited in while trying to replicate a bug on my local machine Removed: struts/action2/trunk/apps/showcase/src/main/resources/tmjee/
svn commit: r415117 - /struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/
Author: tmjee Date: Sun Jun 18 02:25:00 2006 New Revision: 415117 URL: http://svn.apache.org/viewvc?rev=415117&view=rev Log: WW-1351 - added missing apache license on top of code Modified: struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatAuthenticationInterceptor.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatException.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatLoginAction.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatLogoutAction.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatMessage.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatService.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatServiceImpl.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/Constants.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/CrudRoomAction.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/DateConverter.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/EnterRoomAction.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ExitRoomAction.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/MessagesAvailableInRoomAction.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/Room.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/RoomsAvailableAction.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/SendMessageToRoomAction.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/UsersAvailableAction.java struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/UsersAvailableInRoomAction.java Modified: struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatAuthenticationInterceptor.java URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatAuthenticationInterceptor.java?rev=415117&r1=415116&r2=415117&view=diff == --- struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatAuthenticationInterceptor.java (original) +++ struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatAuthenticationInterceptor.java Sun Jun 18 02:25:00 2006 @@ -1,3 +1,20 @@ +/* + * $Id: MemoryStorage.java 394498 2006-04-16 15:28:06Z tmjee $ + * + * 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.struts.action2.showcase.chat; Modified: struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatException.java URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatException.java?rev=415117&r1=415116&r2=415117&view=diff == --- struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatException.java (original) +++ struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatException.java Sun Jun 18 02:25:00 2006 @@ -1,3 +1,20 @@ +/* + * $Id: MemoryStorage.java 394498 2006-04-16 15:28:06Z tmjee $ + * + * 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, eit
svn commit: r415118 - in /struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/actionPrefix: ./ SubmitAction.java
Author: tmjee
Date: Sun Jun 18 04:06:23 2006
New Revision: 415118
URL: http://svn.apache.org/viewvc?rev=415118&view=rev
Log:
WW-1352
- added example in showcase demonstrating the usage of action prefix
Added:
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/actionPrefix/
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/actionPrefix/SubmitAction.java
(with props)
Added:
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/actionPrefix/SubmitAction.java
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/actionPrefix/SubmitAction.java?rev=415118&view=auto
==
---
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/actionPrefix/SubmitAction.java
(added)
+++
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/actionPrefix/SubmitAction.java
Sun Jun 18 04:06:23 2006
@@ -0,0 +1,22 @@
+package org.apache.struts.action2.showcase.tag.nonui.actionPrefix;
+
+import com.opensymphony.xwork.ActionSupport;
+
+public class SubmitAction extends ActionSupport {
+
+ private static final long serialVersionUID = -7832803019378213087L;
+
+ private String text;
+
+ public String getText() { return text; }
+ public void setText(String text) { this.text = text; }
+
+ public String execute() throws Exception {
+ return SUCCESS;
+ }
+
+ public String alternateMethod() {
+ return "methodPrefixResult";
+ }
+
+}
Propchange:
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/actionPrefix/SubmitAction.java
--
svn:eol-style = native
svn commit: r415119 - in /struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix: ./ actionPrefix.ftl actionPrefixExample.ftl index.jsp methodPrefix.ftl normalSubmit.ftl redirectA
Author: tmjee
Date: Sun Jun 18 04:07:09 2006
New Revision: 415119
URL: http://svn.apache.org/viewvc?rev=415119&view=rev
Log:
WW-1352
- added an example into showcase demonstrating the usage of action
prefix
Added:
struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/
struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefix.ftl
struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/index.jsp
(with props)
struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/methodPrefix.ftl
struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/normalSubmit.ftl
struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
Added:
struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefix.ftl
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefix.ftl?rev=415119&view=auto
==
---
struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefix.ftl
(added)
+++
struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefix.ftl
Sun Jun 18 04:07:09 2006
@@ -0,0 +1,19 @@
+
+
+
+
+ Showcase - Tags - Non UI - Action Prefix (freemarker)
+
+
+
+ You have come to this page because you used an 'action' prefix.
+
+ The text you've enter is ${text?default('')}
+
+ <@saf.url id="url" action="actionPrefixExampleUsingFreemarker"
namespace="/tags/non-ui/actionPrefix" />
+ <@saf.a href="%{#url}">Back
+
+
+
+
+
Added:
struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl?rev=415119&view=auto
==
---
struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
(added)
+++
struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
Sun Jun 18 04:07:09 2006
@@ -0,0 +1,45 @@
+
+
+
+ Showcase - Tags - Non UI - Action Prefix
(Freemarker)
+
+
+ Action Prefix
+ By clicking on 'action prefix' button, the request will go to
the action alias 'actionPrefix'
+ instead of the normal 'submit' action alias.
+
+ Method Prefix
+ By clicking on the 'method prefix' button, the request will
cuase SAF to invoke 'submit'
+ action alias's 'alternateMethod' method instead of the default
'execute' method.
+
+ Redirect Prefix
+ By clicking on the 'redirect prefix' button, the request will
get redirected to www.google.com
+ instead
+
+ Redirect Action Prefix
+ By clicking on the 'redirect-action prefix' button, the request
will get redirected to
+ an action alias of 'redirectActionPrefix' instead of 'submit'
action alias. Since this is a
+ redirect (a new request is issue from the client), the text
entered will be lost.
+
+
+ <@saf.url id="url" action="viewSource"
namespace="/tags/non-ui/actionPrefix" />
+ The JSP code can be read <@saf.a href="%{#url}">here.
+
+
+ <@saf.form action="submit"
namespace="/tags/non-ui/actionPrefix" method="POST">
+
+ <@saf.textfield label="Enter Some Text" name="text" />
+
+ <@saf.submit name="action:actionPrefix"
value="%{'action prefix'}" />
+
+ <@saf.submit name="method:alternateMethod"
value="%{'method prefix'}" />
+
+ <@saf.submit name="redirect:http://www.google.com";
value="%{'redirect prefix'}" />
+
+ <@saf.submit
name="redirect-action:redirectActionPrefix" value="%{'redirect-action prefix'}"
/>
+
+ <@saf.submit value="Normal Submit" />
+
+
+
+
Added:
struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/index.jsp
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/index.jsp?rev=415119&view=auto
==
---
strut
svn commit: r415120 - in /struts/action2/trunk/apps/showcase/src/main: resources/xwork-tags-non-ui.xml webapp/tags/non-ui/index.jsp
Author: tmjee Date: Sun Jun 18 04:08:21 2006 New Revision: 415120 URL: http://svn.apache.org/viewvc?rev=415120&view=rev Log: WW-1352 - added an example into showcase demonstrating the usage of action prefix Modified: struts/action2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/index.jsp Modified: struts/action2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml?rev=415120&r1=415119&r2=415120&view=diff == --- struts/action2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml (original) +++ struts/action2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml Sun Jun 18 04:08:21 2006 @@ -83,6 +83,32 @@ + + + + + + /tags/non-ui/actionPrefix/actionPrefixExample.ftl + + + /tags/non-ui/actionPrefix/normalSubmit.ftl + + + /tags/non-ui/actionPrefix/methodPrefix.ftl + + + /tags/non-ui/actionPrefix/actionPrefix.ftl + + + /tags/non-ui/actionPrefix/redirectPrefix.ftl + + + /tags/non-ui/actionPrefix/redirectActionPrefix.ftl + + + /tags/non-ui/actionPrefix/actionPrefixExample.ftl + + Modified: struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/index.jsp URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/index.jsp?rev=415120&r1=415119&r2=415120&view=diff == --- struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/index.jsp (original) +++ struts/action2/trunk/apps/showcase/src/main/webapp/tags/non-ui/index.jsp Sun Jun 18 04:08:21 2006 @@ -14,6 +14,7 @@ Append Iterator Tag Merge Iterator Demo Subset Tag + Action Prefix Example
svn commit: r415139 - /struts/action2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
Author: tmjee Date: Sun Jun 18 07:00:02 2006 New Revision: 415139 URL: http://svn.apache.org/viewvc?rev=415139&view=rev Log: WW-1354 - corrected showcase tabpanel example3 , local panel are marked with theme="ajax" causing them to not function properly Modified: struts/action2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp Modified: struts/action2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp?rev=415139&r1=415138&r2=415139&view=diff == --- struts/action2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp (original) +++ struts/action2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp Sun Jun 18 07:00:02 2006 @@ -29,7 +29,7 @@ - + This is the left pane @@ -37,7 +37,7 @@ - + middle tab
svn commit: r415143 - /struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
Author: tmjee
Date: Sun Jun 18 07:39:56 2006
New Revision: 415143
URL: http://svn.apache.org/viewvc?rev=415143&view=rev
Log:
WW-1355
- make method not exposed to other classes protected instead of public
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java?rev=415143&r1=415142&r2=415143&view=diff
==
---
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
(original)
+++
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
Sun Jun 18 07:39:56 2006
@@ -156,7 +156,7 @@
return config;
}
-public ScopesHashModel buildScopesHashModel(ServletContext servletContext,
HttpServletRequest request, HttpServletResponse response, ObjectWrapper
wrapper, OgnlValueStack stack) {
+protected ScopesHashModel buildScopesHashModel(ServletContext
servletContext, HttpServletRequest request, HttpServletResponse response,
ObjectWrapper wrapper, OgnlValueStack stack) {
ScopesHashModel model = new ScopesHashModel(wrapper, servletContext,
request, stack);
// Create hash model wrapper for servlet context (the application)
@@ -215,7 +215,7 @@
return model;
}
-public void populateContext(ScopesHashModel model, OgnlValueStack stack,
Object action, HttpServletRequest request, HttpServletResponse response) {
+protected void populateContext(ScopesHashModel model, OgnlValueStack
stack, Object action, HttpServletRequest request, HttpServletResponse response)
{
// put the same objects into the context that the velocity result uses
Map standard = ContextUtil.getStandardContext(stack, request,
response);
model.putAll(standard);
svn commit: r415148 - in /struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor: RequestAware.java ServletConfigInterceptor.java
Author: tmjee
Date: Sun Jun 18 08:23:20 2006
New Revision: 415148
URL: http://svn.apache.org/viewvc?rev=415148&view=rev
Log:
WW-1356
- added RequestAware capability to action.
Added:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/RequestAware.java
(with props)
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
Added:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/RequestAware.java
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/RequestAware.java?rev=415148&view=auto
==
---
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/RequestAware.java
(added)
+++
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/RequestAware.java
Sun Jun 18 08:23:20 2006
@@ -0,0 +1,38 @@
+/*
+ * $Id: SessionAware.java 394468 2006-04-16 12:16:03Z tmjee $
+ *
+ * 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.struts.action2.interceptor;
+
+import java.util.Map;
+
+/**
+ * Actions that want access to the current serlvet request attributes should
implement this interface.
+ *
+ * This interface is only relevant if the Action is used in a servlet
environment.
+ *
+ * Note that using this interface makes the Action tied to a servlet
environment, so it should be
+ * avoided if possible since things like unit testing will become more
difficult.
+ */
+public interface RequestAware {
+
+ /**
+ * Sets the Map of request attributes in the implementing class.
+ *
+ * @param session a Map of HTTP request attribute name/value pairs.
+ */
+public void setRequest(Map request);
+}
Propchange:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/RequestAware.java
--
svn:eol-style = native
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java?rev=415148&r1=415147&r2=415148&view=diff
==
---
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
(original)
+++
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
Sun Jun 18 08:23:20 2006
@@ -17,6 +17,8 @@
*/
package org.apache.struts.action2.interceptor;
+import java.util.Map;
+
import org.apache.struts.action2.StrutsStatics;
import org.apache.struts.action2.util.ServletContextAware;
import com.opensymphony.xwork.ActionContext;
@@ -129,6 +131,10 @@
if (action instanceof ParameterAware) {
((ParameterAware) action).setParameters(context.getParameters());
+}
+
+if (action instanceof RequestAware) {
+ ((RequestAware) action).setRequest((Map)
context.get("request"));
}
if (action instanceof SessionAware) {
svn commit: r415149 - /struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
Author: tmjee Date: Sun Jun 18 08:25:51 2006 New Revision: 415149 URL: http://svn.apache.org/viewvc?rev=415149&view=rev Log: WW-1356 - updated javadoc to indicate the availability of RequestAware that an action could implements if it wishes to have access to Request atrributes as Map Modified: struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java Modified: struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java?rev=415149&r1=415148&r2=415149&view=diff == --- struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java (original) +++ struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java Sun Jun 18 08:25:51 2006 @@ -48,6 +48,8 @@ * [EMAIL PROTECTED] ServletResponseAware} * * [EMAIL PROTECTED] ParameterAware} + * + * [EMAIL PROTECTED] RequestAware} * * [EMAIL PROTECTED] SessionAware} *
svn commit: r415227 - in /struts/shale/trunk/src/site/xdoc: building.xml index.xml
Author: wsmoak
Date: Sun Jun 18 18:30:11 2006
New Revision: 415227
URL: http://svn.apache.org/viewvc?rev=415227&view=rev
Log:
[SHALE-179] Maven 2 reorg - Update the information on acquiring and building.
Modified:
struts/shale/trunk/src/site/xdoc/building.xml
struts/shale/trunk/src/site/xdoc/index.xml
Modified: struts/shale/trunk/src/site/xdoc/building.xml
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/src/site/xdoc/building.xml?rev=415227&r1=415226&r2=415227&view=diff
==
--- struts/shale/trunk/src/site/xdoc/building.xml (original)
+++ struts/shale/trunk/src/site/xdoc/building.xml Sun Jun 18 18:30:11 2006
@@ -25,24 +25,58 @@
The easiest way to acquire the source code for Shale is to download
one of the
http://cvs.apache.org/builds/struts/nightly/struts-shale/";>
-Nightly Build or release distributions, which contain both the
+Nightly Build or http://struts.apache.org/downloads.html";>
+Release Distributions, which contain both the
source code and the binary libraries. Alternatively, you can check out
the source code from the Struts Subversion repository using the
URLs specified
-http://struts.apache.org/downloads.html#Source_Code";>here.
+http://struts.apache.org/downloads.html#Source%20Code";>here.
+
+
+
+ Once you have acquired the
+ source code for Shale from the Subversion repository or a nightly
+ build, as described above, you can proceed to set up a development
+ environment with which to build it. Follow these steps to
continue:
+
+
+ Acquire a copy of a http://java.sun.com/javase/";>Java
+ Development Kit (Version 1.4 or later), and install it
according
+ to the provided documentation.
+ Acquire a copy of http://maven.apache.org/";>Apache
Maven
+ (version 2.0.4 or later), and install it according to the
+ provided documentation.
+ By default, the Shale build uses http://myfaces.apache.org";>
+ Apache MyFaces, but you can also build against the JavaServer
+ Faces Reference Implementation by adding -Djsf=ri
+ to the command line.
+ In the top-level directory of the unpacked Shale distribution,
+ execute the command mvn clean install to completely
+ rebuild the framework distribution from source.
+ In the shale-apps directory of the unpacked Shale distribution,
+ execute the command mvn clean install to
completely
+ rebuild the example applications from source.
+ In addition, each of the major source subdirectories has a
properly
+ configured pom.xml file, so you can rebuild just
that
+ subdirectory if desired.
+
+
+
+
+
-
+
Once you have acquired the
-source code for Shale, as described above, you can proceed to set
+Shale 1.0.2 (Alpha) distribution, you can proceed to set
up a development environment with which to build it. Follow these
steps to continue:
-Acquire a copy of a http://java.sun.com/j2se/";>Java
+Acquire a copy of a http://java.sun.com/javase/";>Java
Development Kit (Version 1.4 or later), and install it
according
to the provided documentation.
Acquire a copy of http://ant.apache.org/";>Apache Ant
Modified: struts/shale/trunk/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/src/site/xdoc/index.xml?rev=415227&r1=415226&r2=415227&view=diff
==
--- struts/shale/trunk/src/site/xdoc/index.xml (original)
+++ struts/shale/trunk/src/site/xdoc/index.xml Sun Jun 18 18:30:11 2006
@@ -199,23 +199,17 @@
- shale-framework-MMDD.{tar.gz,zip} - The binary
- and source download of the framework itself.
-
- shale-dependencies-MMDD.{tar.gz,zip} - For convenience,
- this is a snapshot of all the dependencies (other than the JavaServer
- Faces RI, which cannot be included for license reasons) that would
- normally be downloaded by executing the download-dependencies target in
- the top level build script.
-
- shale-starter-MMDD.{tar.gz,zip} - A starting point source
- directory structure for a Shale based application that will use Ant as
the
- build tool. This is based on the source code of the Shale Blank Starter
- Application example, but separated out for the convenience of those who
- need only this feature.
-
- shale--MMDD.war - A web application archive for
- each example application that is avaiable. Currently, the available
+ shale-framework-1
svn commit: r415235 - in /struts/shale/trunk: shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/ shale-apps/shale-clay-usecases/src/main/webapp/rolodex/ shale-apps/shale-usecases/src/main/webapp/
Author: gvanmatre
Date: Sun Jun 18 20:13:33 2006
New Revision: 415235
URL: http://svn.apache.org/viewvc?rev=415235&view=rev
Log:
Fix for issue Shale-194 reported by Jack Cheng.
Added:
struts/shale/trunk/shale-core/src/main/resources/org/apache/shale/validator/validateUtilities.js
(with props)
Modified:
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/clay-config.xml
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/hrolodex.html
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jsprolodex.jsp
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/xhrolodex.html
struts/shale/trunk/shale-apps/shale-usecases/src/main/webapp/validator/test.jsp
struts/shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/Builder.java
struts/shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/ElementBuilder.java
struts/shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/JsfDefaultBuilder.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/component/ValidatorScript.java
struts/shale/trunk/shale-core/src/main/resources/org/apache/shale/validator/validator-rules.xml
struts/shale/trunk/shale-core/src/test/java/org/apache/shale/validator/CommonsValidatorTestCase.java
Modified:
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/clay-config.xml
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/clay-config.xml?rev=415235&r1=415234&r2=415235&view=diff
==
---
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/clay-config.xml
(original)
+++
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/clay-config.xml
Sun Jun 18 20:13:33 2006
@@ -347,6 +347,14 @@
+
+
+
+
+
+
+
+
@@ -613,6 +621,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Modified:
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/hrolodex.html
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/hrolodex.html?rev=415235&r1=415234&r2=415235&view=diff
==
---
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/hrolodex.html
(original)
+++
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/hrolodex.html
Sun Jun 18 20:13:33 2006
@@ -130,8 +130,8 @@
-Back
+
+Back
@@ -313,5 +313,6 @@
+
Modified:
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html?rev=415235&r1=415234&r2=415235&view=diff
==
---
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html
(original)
+++
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html
Sun Jun 18 20:13:33 2006
@@ -1,7 +1,8 @@
http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"
xmlns:f="http://java.sun.com/jsf/core";
xmlns:h="http://java.sun.com/jsf/html";
- xmlns:clay="http://struts.apache.org/shale/clay-plugin";>
+ xmlns:clay="http://struts.apache.org/shale/clay-plugin";
+ xmlns:s="http://struts.apache.org/shale/core";>
@@ -133,8 +134,8 @@
-
+
+
@@ -176,7 +177,11 @@
value="#{messages['rolodex.email']}"
extends="baseLabel" />
+ required="false" size="30"
maxlength="50">
+
+
+
@@ -345,5 +350,6 @@
+
Modified:
struts/shale/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jsprolodex.jsp
URL:
ht
svn commit: r415249 - in /struts/sandbox/trunk/archetypes/shale-blank/src: main/resources/archetype-resources/ main/resources/archetype-resources/core/ main/resources/archetype-resources/core/src/ mai
Author: wsmoak Date: Sun Jun 18 22:53:33 2006 New Revision: 415249 URL: http://svn.apache.org/viewvc?rev=415249&view=rev Log: Initial restructuring of the Shale Blank archetype into a multi-module project archetype. Added: struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/pom.xml (with props) struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/apache/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/apache/shale/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/apache/shale/blank/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/apache/shale/blank/WelcomeBean.java - copied, changed from r414999, struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/java/WelcomeBean.java struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/org/apache/shale/blank/package.html - copied unchanged from r414999, struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/java/package.html struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/java/overview.html - copied unchanged from r414999, struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/java/overview.html struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/resources/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/resources/org/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/resources/org/apache/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/resources/org/apache/shale/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/resources/org/apache/shale/blank/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/main/resources/org/apache/shale/blank/Bundle.properties - copied unchanged from r414999, struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/resources/Bundle.properties struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/org/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/org/apache/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/org/apache/shale/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/org/apache/shale/blank/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/core/src/test/java/org/apache/shale/blank/WelcomeBeanTestCase.java - copied, changed from r414999, struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/test/java/WelcomeBeanTestCase.java struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/pom.xml (with props) struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/src/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/src/it/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/src/it/java/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/src/it/java/org/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/src/it/java/org/apache/ struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/integration/src/it/java/org/apache/shale/ struts/sandbox/trunk/archet
svn commit: r415250 - in /struts/sandbox/trunk/archetypes: shale-blank/ shale-starter/
Author: wsmoak Date: Sun Jun 18 23:09:47 2006 New Revision: 415250 URL: http://svn.apache.org/viewvc?rev=415250&view=rev Log: Renamed remotely: shale-blank -> shale-starter Added: struts/sandbox/trunk/archetypes/shale-starter/ - copied from r415249, struts/sandbox/trunk/archetypes/shale-blank/ Removed: struts/sandbox/trunk/archetypes/shale-blank/
svn commit: r415251 - in /struts/sandbox/trunk/archetypes/shale-starter: ./ src/main/resources/archetype-resources/ src/main/resources/archetype-resources/core/ src/main/resources/archetype-resources/
Author: wsmoak Date: Sun Jun 18 23:25:29 2006 New Revision: 415251 URL: http://svn.apache.org/viewvc?rev=415251&view=rev Log: Add license headers and fix names in the pom. Modified: struts/sandbox/trunk/archetypes/shale-starter/pom.xml struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/core/pom.xml struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/integration/pom.xml struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/pom.xml struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/webapp/pom.xml Modified: struts/sandbox/trunk/archetypes/shale-starter/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-starter/pom.xml?rev=415251&r1=415250&r2=415251&view=diff == --- struts/sandbox/trunk/archetypes/shale-starter/pom.xml (original) +++ struts/sandbox/trunk/archetypes/shale-starter/pom.xml Sun Jun 18 23:25:29 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";> @@ -10,10 +30,10 @@ org.apache.struts.shale - struts-archetype-shale-blank + shale-starter-archetype 1.0-SNAPSHOT jar - Shale Blank Archetype + Shale Starter Archetype Modified: struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/core/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/core/pom.xml?rev=415251&r1=415250&r2=415251&view=diff == --- struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/core/pom.xml (original) +++ struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/core/pom.xml Sun Jun 18 23:25:29 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";> Modified: struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/integration/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/integration/pom.xml?rev=415251&r1=415250&r2=415251&view=diff == --- struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/integration/pom.xml (original) +++ struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/integration/pom.xml Sun Jun 18 23:25:29 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";> Modified: struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/pom.xml?rev=415251&r1=415250&r2=415251&view=diff == --- struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/pom.xml (original) +++ struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/pom.xml Sun Jun 18 23:25:29 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";> Modified: struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/webapp/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/webapp/pom.xml?rev=415251&r1=415250&r2=415251&view=diff == --- struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/webapp/pom.xml (original) +++ struts/sandbox/trunk/archetypes/shale-starter/src/main/resources/archetype-resources/webapp/pom.xml Sun Jun 18 23:25:29 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";>
