You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ma...@apache.org on 2005/08/05 06:13:54 UTC
svn commit: r230394 [2/2] - in /struts/sandbox/trunk/ti/src:
example/WEB-INF/src/java/ example/WEB-INF/src/java/ttt/
java/org/apache/ti/config/ java/org/apache/ti/config/mapper/
java/org/apache/ti/processor/ java/org/apache/ti/processor/chain/ java/org...
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ChainRequestProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ChainRequestProcessor.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionMapping.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionMapping.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionMapping.java (original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionMapping.java Thu Aug 4 21:13:44 2005
@@ -1,46 +1,46 @@
-/*
- * $Id$
- *
- * Copyright 2005 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.ti.processor.chain;
-
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.web.WebContext;
-import org.apache.ti.config.mapper.ActionMapper;
-import org.apache.ti.config.mapper.ActionMapping;
-
-/**
- * Creates an ActionMapping and stores it in the context.
- */
-public class CreateActionMapping implements Command {
-
- protected ActionMapper actionMapper;
-
- public void setActionMapper(ActionMapper mapper) {
- this.actionMapper = mapper;
- }
-
- public boolean execute(Context origctx) {
- WebContext ctx = (WebContext)origctx;
-
- ActionMapping mapping = actionMapper.getMapping(ctx);
- ctx.put("actionMapping", mapping);
- return false;
- }
-
-
-}
+/*
+ * $Id$
+ *
+ * Copyright 2005 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.ti.processor.chain;
+
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.Context;
+import org.apache.commons.chain.web.WebContext;
+import org.apache.ti.config.mapper.ActionMapper;
+import org.apache.ti.config.mapper.ActionMapping;
+
+/**
+ * Creates an ActionMapping and stores it in the context.
+ */
+public class CreateActionMapping implements Command {
+
+ protected ActionMapper actionMapper;
+
+ public void setActionMapper(ActionMapper mapper) {
+ this.actionMapper = mapper;
+ }
+
+ public boolean execute(Context origctx) {
+ WebContext ctx = (WebContext)origctx;
+
+ ActionMapping mapping = actionMapper.getMapping(ctx);
+ ctx.put("actionMapping", mapping);
+ return false;
+ }
+
+
+}
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionMapping.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionMapping.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java (original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java Thu Aug 4 21:13:44 2005
@@ -1,122 +1,122 @@
-/*
- * $Id$
- *
- * Copyright 2005 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.ti.processor.chain;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.web.WebContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ti.config.mapper.ActionMapping;
-import org.apache.ti.processor.ProcessorException;
-
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionProxy;
-import com.opensymphony.xwork.ActionProxyFactory;
-import com.opensymphony.xwork.config.ConfigurationException;
-
-
-/**
- * Creates an ActionProxy instance
- */
-public class CreateActionProxy implements Command {
-
- protected static final Log log = LogFactory.getLog(CreateActionProxy.class);
-
- public boolean execute(Context origctx) {
- WebContext ctx = (WebContext)origctx;
-
- ActionMapping mapping = (ActionMapping)ctx.get("actionMapping");
- ActionProxy proxy = getActionProxy(ctx, mapping);
-
- ctx.put("actionProxy", proxy);
- return false;
- }
-
- protected ActionProxy getActionProxy(WebContext ctx, ActionMapping mapping) {
-
- // request map wrapping the http request objects
- Map requestMap = ctx.getRequestScope();
-
- // parameters map wrapping the http paraneters.
- Map params = mapping.getParams();
- Map requestParams = ctx.getParamValues();
- if (params != null) {
- params.putAll(requestParams);
- } else {
- params = requestParams;
- }
-
- HashMap extraContext = createContextMap(requestMap, params, ctx.getSessionScope(), ctx.getApplicationScope(), ctx);
-
- // If there was a previous value stack, then create a new copy and pass it in to be used by the new Action
- //OgnlValueStack stack = (OgnlValueStack) requestMap.get(ServletActionContext.WEBWORK_VALUESTACK_KEY);
- //if (stack != null) {
- // extraContext.put(ActionContext.VALUE_STACK, new OgnlValueStack(stack));
- //}
- try {
- ActionProxy proxy = ActionProxyFactory.getFactory().createActionProxy(mapping.getNamespace(), mapping.getName(), extraContext);
- //request.setAttribute(ServletActionContext.WEBWORK_VALUESTACK_KEY, proxy.getInvocation().getStack());
- return proxy;
- } catch (ConfigurationException e) {
- log.error("Could not find action", e);
- throw new ProcessorException(e);
- } catch (Exception e) {
- log.error("Could not execute action", e);
- throw new ProcessorException(e);
- }
- }
-
- /**
- * Merges all application and servlet attributes into a single <tt>HashMap</tt> to represent the entire
- * <tt>Action</tt> context.
- *
- * @param requestMap a Map of all request attributes.
- * @param parameterMap a Map of all request parameters.
- * @param sessionMap a Map of all session attributes.
- * @param applicationMap a Map of all servlet context attributes.
- * @return a HashMap representing the <tt>Action</tt> context.
- */
- public HashMap createContextMap(Map requestMap,
- Map parameterMap,
- Map sessionMap,
- Map applicationMap,
- WebContext ctx) {
- HashMap extraContext = new HashMap();
- extraContext.put(ActionContext.PARAMETERS, new HashMap(parameterMap));
- extraContext.put(ActionContext.SESSION, sessionMap);
- extraContext.put(ActionContext.APPLICATION, applicationMap);
- //extraContext.put(ActionContext.LOCALE, (locale == null) ? request.getLocale() : locale);
-
- extraContext.put("webContext", ctx);
-
- // helpers to get access to request/session/application scope
- extraContext.put("request", requestMap);
- extraContext.put("session", sessionMap);
- extraContext.put("application", applicationMap);
- extraContext.put("parameters", parameterMap);
-
- return extraContext;
- }
-
-
-
-}
+/*
+ * $Id$
+ *
+ * Copyright 2005 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.ti.processor.chain;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.Context;
+import org.apache.commons.chain.web.WebContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ti.config.mapper.ActionMapping;
+import org.apache.ti.processor.ProcessorException;
+
+import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork.ActionProxy;
+import com.opensymphony.xwork.ActionProxyFactory;
+import com.opensymphony.xwork.config.ConfigurationException;
+
+
+/**
+ * Creates an ActionProxy instance
+ */
+public class CreateActionProxy implements Command {
+
+ protected static final Log log = LogFactory.getLog(CreateActionProxy.class);
+
+ public boolean execute(Context origctx) {
+ WebContext ctx = (WebContext)origctx;
+
+ ActionMapping mapping = (ActionMapping)ctx.get("actionMapping");
+ ActionProxy proxy = getActionProxy(ctx, mapping);
+
+ ctx.put("actionProxy", proxy);
+ return false;
+ }
+
+ protected ActionProxy getActionProxy(WebContext ctx, ActionMapping mapping) {
+
+ // request map wrapping the http request objects
+ Map requestMap = ctx.getRequestScope();
+
+ // parameters map wrapping the http paraneters.
+ Map params = mapping.getParams();
+ Map requestParams = ctx.getParamValues();
+ if (params != null) {
+ params.putAll(requestParams);
+ } else {
+ params = requestParams;
+ }
+
+ HashMap extraContext = createContextMap(requestMap, params, ctx.getSessionScope(), ctx.getApplicationScope(), ctx);
+
+ // If there was a previous value stack, then create a new copy and pass it in to be used by the new Action
+ //OgnlValueStack stack = (OgnlValueStack) requestMap.get(ServletActionContext.WEBWORK_VALUESTACK_KEY);
+ //if (stack != null) {
+ // extraContext.put(ActionContext.VALUE_STACK, new OgnlValueStack(stack));
+ //}
+ try {
+ ActionProxy proxy = ActionProxyFactory.getFactory().createActionProxy(mapping.getNamespace(), mapping.getName(), extraContext);
+ //request.setAttribute(ServletActionContext.WEBWORK_VALUESTACK_KEY, proxy.getInvocation().getStack());
+ return proxy;
+ } catch (ConfigurationException e) {
+ log.error("Could not find action", e);
+ throw new ProcessorException(e);
+ } catch (Exception e) {
+ log.error("Could not execute action", e);
+ throw new ProcessorException(e);
+ }
+ }
+
+ /**
+ * Merges all application and servlet attributes into a single <tt>HashMap</tt> to represent the entire
+ * <tt>Action</tt> context.
+ *
+ * @param requestMap a Map of all request attributes.
+ * @param parameterMap a Map of all request parameters.
+ * @param sessionMap a Map of all session attributes.
+ * @param applicationMap a Map of all servlet context attributes.
+ * @return a HashMap representing the <tt>Action</tt> context.
+ */
+ public HashMap createContextMap(Map requestMap,
+ Map parameterMap,
+ Map sessionMap,
+ Map applicationMap,
+ WebContext ctx) {
+ HashMap extraContext = new HashMap();
+ extraContext.put(ActionContext.PARAMETERS, new HashMap(parameterMap));
+ extraContext.put(ActionContext.SESSION, sessionMap);
+ extraContext.put(ActionContext.APPLICATION, applicationMap);
+ //extraContext.put(ActionContext.LOCALE, (locale == null) ? request.getLocale() : locale);
+
+ extraContext.put("webContext", ctx);
+
+ // helpers to get access to request/session/application scope
+ extraContext.put("request", requestMap);
+ extraContext.put("session", sessionMap);
+ extraContext.put("application", applicationMap);
+ extraContext.put("parameters", parameterMap);
+
+ return extraContext;
+ }
+
+
+
+}
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ExecuteAction.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ExecuteAction.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ExecuteAction.java (original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ExecuteAction.java Thu Aug 4 21:13:44 2005
@@ -1,43 +1,43 @@
-/*
- * $Id$
- *
- * Copyright 2005 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.ti.processor.chain;
-
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionProxy;
-
-
-/**
- * Initializes XWork by replacing default factories
- */
-public class ExecuteAction implements Command {
-
- public boolean execute(Context origctx) throws Exception {
- ActionContext ctx = ActionContext.getContext();
- ActionProxy proxy = ctx.getActionInvocation().getProxy();
-
- String ret = proxy.execute();
-
- origctx.put("result", ret);
- return false;
- }
-
-
-}
+/*
+ * $Id$
+ *
+ * Copyright 2005 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.ti.processor.chain;
+
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.Context;
+
+import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork.ActionProxy;
+
+
+/**
+ * Initializes XWork by replacing default factories
+ */
+public class ExecuteAction implements Command {
+
+ public boolean execute(Context origctx) throws Exception {
+ ActionContext ctx = ActionContext.getContext();
+ ActionProxy proxy = ctx.getActionInvocation().getProxy();
+
+ String ret = proxy.execute();
+
+ origctx.put("result", ret);
+ return false;
+ }
+
+
+}
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ExecuteAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ExecuteAction.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitControllerContext.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitControllerContext.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitControllerContext.java (original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitControllerContext.java Thu Aug 4 21:13:44 2005
@@ -1,43 +1,43 @@
-/*
- * $Id$
- *
- * Copyright 2005 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.ti.processor.chain;
-
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ti.processor.ControllerContext;
-
-
-/**
- * Intializes the ControllerContext for this request
- */
-public class InitControllerContext implements Command {
-
- protected ControllerContext context;
- protected static final Log log = LogFactory.getLog(InitControllerContext.class);
-
- public void setControllerContext(ControllerContext ctx) {
- this.context = ctx;
- }
-
- public boolean execute(Context origctx) {
- ControllerContext.setControllerContext(context);
- return false;
- }
-}
+/*
+ * $Id$
+ *
+ * Copyright 2005 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.ti.processor.chain;
+
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.Context;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ti.processor.ControllerContext;
+
+
+/**
+ * Intializes the ControllerContext for this request
+ */
+public class InitControllerContext implements Command {
+
+ protected ControllerContext context;
+ protected static final Log log = LogFactory.getLog(InitControllerContext.class);
+
+ public void setControllerContext(ControllerContext ctx) {
+ this.context = ctx;
+ }
+
+ public boolean execute(Context origctx) {
+ ControllerContext.setControllerContext(context);
+ return false;
+ }
+}
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitControllerContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitControllerContext.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java (original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java Thu Aug 4 21:13:44 2005
@@ -1,54 +1,54 @@
-/*
- * $Id$
- *
- * Copyright 2005 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.ti.processor.chain;
-
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.web.WebContext;
-
-import com.opensymphony.xwork.ActionProxyFactory;
-import com.opensymphony.xwork.ObjectFactory;
-
-
-/**
- * Initializes XWork by replacing default factories
- */
-public class InitXWork implements Command {
-
- protected ObjectFactory objectFactory;
- protected ActionProxyFactory actionProxyFactory;
-
- public void setObjectFactory(ObjectFactory factory) {
- this.objectFactory = factory;
- }
-
- public void setActionProxyFactory(ActionProxyFactory factory) {
- this.actionProxyFactory = factory;
- }
-
- public boolean execute(Context origctx) {
- WebContext ctx = (WebContext)origctx;
-
- ObjectFactory.setObjectFactory(objectFactory);
- ActionProxyFactory.setFactory(actionProxyFactory);
-
- return false;
- }
-
-
-}
+/*
+ * $Id$
+ *
+ * Copyright 2005 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.ti.processor.chain;
+
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.Context;
+import org.apache.commons.chain.web.WebContext;
+
+import com.opensymphony.xwork.ActionProxyFactory;
+import com.opensymphony.xwork.ObjectFactory;
+
+
+/**
+ * Initializes XWork by replacing default factories
+ */
+public class InitXWork implements Command {
+
+ protected ObjectFactory objectFactory;
+ protected ActionProxyFactory actionProxyFactory;
+
+ public void setObjectFactory(ObjectFactory factory) {
+ this.objectFactory = factory;
+ }
+
+ public void setActionProxyFactory(ActionProxyFactory factory) {
+ this.actionProxyFactory = factory;
+ }
+
+ public boolean execute(Context origctx) {
+ WebContext ctx = (WebContext)origctx;
+
+ ObjectFactory.setObjectFactory(objectFactory);
+ ActionProxyFactory.setFactory(actionProxyFactory);
+
+ return false;
+ }
+
+
+}
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ProcessActionChain.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ProcessActionChain.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ProcessActionChain.java (original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ProcessActionChain.java Thu Aug 4 21:13:44 2005
@@ -1,52 +1,52 @@
-/*
- * $Id$
- *
- * Copyright 2005 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.ti.processor.chain;
-
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.impl.ChainBase;
-
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionProxy;
-
-
-
-/**
- * Initializes XWork by replacing default factories
- */
-public class ProcessActionChain extends ChainBase {
-
- public boolean execute(Context context) throws Exception {
-
- ActionContext nestedContext = ActionContext.getContext();
-
- ActionProxy proxy = (ActionProxy) context.get("actionProxy");
- ActionContext.setContext(proxy.getInvocation().getInvocationContext());
-
- boolean retCode = false;
-
- try {
- retCode = super.execute(context);
- } finally {
- ActionContext.setContext(nestedContext);
- }
-
- return retCode;
- }
-
-
-}
+/*
+ * $Id$
+ *
+ * Copyright 2005 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.ti.processor.chain;
+
+import org.apache.commons.chain.Context;
+import org.apache.commons.chain.impl.ChainBase;
+
+import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork.ActionProxy;
+
+
+
+/**
+ * Initializes XWork by replacing default factories
+ */
+public class ProcessActionChain extends ChainBase {
+
+ public boolean execute(Context context) throws Exception {
+
+ ActionContext nestedContext = ActionContext.getContext();
+
+ ActionProxy proxy = (ActionProxy) context.get("actionProxy");
+ ActionContext.setContext(proxy.getInvocation().getInvocationContext());
+
+ boolean retCode = false;
+
+ try {
+ retCode = super.execute(context);
+ } finally {
+ ActionContext.setContext(nestedContext);
+ }
+
+ return retCode;
+ }
+
+
+}
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ProcessActionChain.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ProcessActionChain.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/SpringConfigRuleSet.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/SpringConfigRuleSet.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/SpringConfigRuleSet.java (original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/SpringConfigRuleSet.java Thu Aug 4 21:13:44 2005
@@ -1,81 +1,81 @@
-/*
- * $Id$
- *
- * Copyright 2005 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.ti.processor.chain;
-
-
-import java.util.List;
-
-import org.apache.commons.chain.config.ConfigRuleSet;
-import org.apache.commons.digester.Digester;
-import org.apache.commons.digester.ObjectCreateRule;
-import org.apache.commons.digester.Rule;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.xml.sax.Attributes;
-
-
-/**
- * Builds on commons-chain rule set to first try to locate the command name in
- * a bean factory before processing the command class name.
- */
-public class SpringConfigRuleSet extends ConfigRuleSet implements BeanFactoryAware {
-
- protected BeanFactory factory;
-
- public void setBeanFactory(BeanFactory factory) {
- this.factory = factory;
- }
-
- /**
- * <p>Add the set of Rule instances defined in this RuleSet to the
- * specified <code>Digester</code> instance, associating them with
- * our namespace URI (if any). This method should only be called
- * by a Digester instance.</p>
- *
- * @param digester Digester instance to which the new Rule instances
- * should be added.
- */
- public void addRuleInstances(Digester digester) {
-
- super.addRuleInstances(digester);
- String pattern = "*/" + getCommandElement();
-
- // Add rules for a command element
- Rule rule = new ObjectCreateRule(digester, null, getClassAttribute()) {
- public void begin(Attributes attrs) throws Exception {
- String name = attrs.getValue(getNameAttribute());
- System.out.println("looking up "+name);
- if (name != null) {
- if (factory.containsBean(name)) {
- getDigester().push(factory.getBean(name));
- } else {
- super.begin(attrs);
- }
- } else {
- throw new IllegalArgumentException("Unable to locate class name");
- }
- }
- };
- rule.setDigester(digester);
-
- List list = digester.getRules().match(null, pattern);
- list.set(0, rule);
- }
-
-
-}
+/*
+ * $Id$
+ *
+ * Copyright 2005 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.ti.processor.chain;
+
+
+import java.util.List;
+
+import org.apache.commons.chain.config.ConfigRuleSet;
+import org.apache.commons.digester.Digester;
+import org.apache.commons.digester.ObjectCreateRule;
+import org.apache.commons.digester.Rule;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.xml.sax.Attributes;
+
+
+/**
+ * Builds on commons-chain rule set to first try to locate the command name in
+ * a bean factory before processing the command class name.
+ */
+public class SpringConfigRuleSet extends ConfigRuleSet implements BeanFactoryAware {
+
+ protected BeanFactory factory;
+
+ public void setBeanFactory(BeanFactory factory) {
+ this.factory = factory;
+ }
+
+ /**
+ * <p>Add the set of Rule instances defined in this RuleSet to the
+ * specified <code>Digester</code> instance, associating them with
+ * our namespace URI (if any). This method should only be called
+ * by a Digester instance.</p>
+ *
+ * @param digester Digester instance to which the new Rule instances
+ * should be added.
+ */
+ public void addRuleInstances(Digester digester) {
+
+ super.addRuleInstances(digester);
+ String pattern = "*/" + getCommandElement();
+
+ // Add rules for a command element
+ Rule rule = new ObjectCreateRule(digester, null, getClassAttribute()) {
+ public void begin(Attributes attrs) throws Exception {
+ String name = attrs.getValue(getNameAttribute());
+ System.out.println("looking up "+name);
+ if (name != null) {
+ if (factory.containsBean(name)) {
+ getDigester().push(factory.getBean(name));
+ } else {
+ super.begin(attrs);
+ }
+ } else {
+ throw new IllegalArgumentException("Unable to locate class name");
+ }
+ }
+ };
+ rule.setDigester(digester);
+
+ List list = digester.getRules().match(null, pattern);
+ list.set(0, rule);
+ }
+
+
+}
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/SpringConfigRuleSet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/SpringConfigRuleSet.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/ServletDispatcherResult.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/ServletDispatcherResult.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/ServletDispatcherResult.java (original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/ServletDispatcherResult.java Thu Aug 4 21:13:44 2005
@@ -1,90 +1,90 @@
-/*
- * Copyright (c) 2002-2003 by OpenSymphony
- * All rights reserved.
- */
-package org.apache.ti.servlet;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.chain.web.servlet.ServletWebContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ti.processor.BaseResult;
-import org.apache.ti.processor.ControllerContext;
-
-import com.opensymphony.xwork.ActionInvocation;
-
-/**
- * Includes or forwards a view. There are three possible ways the result can be executed: <ul>
- * <p/>
- * <li>If we are in the scope of a JSP (a PageContext is available), PageContext's
- * {@link PageContext#include(String) include} method is called.</li>
- * <p/>
- * <li>If there is no PageContext and we're not in any sort of include (there is no
- * "javax.servlet.include.servlet_path" in the request attributes), then a call to
- * {@link RequestDispatcher#forward(javax.servlet.ServletRequest, javax.servlet.ServletResponse) forward}
- * is made.</li>
- * <p/>
- * <li>Otherwise, {@link RequestDispatcher#include(javax.servlet.ServletRequest, javax.servlet.ServletResponse) include}
- * is called.</li></ul>
- * <p/>
- * This result follows the same rules from {@link WebWorkResultSupport}.
- *
- * @author Patrick Lightbody
- * @see javax.servlet.RequestDispatcher
- */
-public class ServletDispatcherResult extends BaseResult {
- //~ Static fields/initializers /////////////////////////////////////////////
-
- private static final Log log = LogFactory.getLog(ServletDispatcherResult.class);
-
- //~ Methods ////////////////////////////////////////////////////////////////
-
- /**
- * Dispatches to the given location. Does its forward via a RequestDispatcher. If the
- * dispatch fails a 404 error will be sent back in the http response.
- *
- * @param finalLocation the location to dispatch to.
- * @param invocation the execution state of the action
- * @throws Exception if an error occurs. If the dispatch fails the error will go back via the
- * HTTP request.
- */
- public void doExecute(String finalLocation, ActionInvocation invocation) throws Exception {
- if (log.isDebugEnabled()) {
- log.debug("Forwarding to location " + finalLocation);
- }
-
- ServletWebContext ctx = (ServletWebContext) ControllerContext.getContext().getWebContext();
-
- //PageContext pageContext = ServletActionContext.getPageContext();
-
- //if (pageContext != null) {
- // pageContext.include(finalLocation);
- //} else {
- HttpServletRequest request = ctx.getRequest();
- HttpServletResponse response = ctx.getResponse();
- RequestDispatcher dispatcher = request.getRequestDispatcher(finalLocation);
-
- // if the view doesn't exist, let's do a 404
- if (dispatcher == null) {
- response.sendError(404, "result '" + finalLocation + "' not found");
-
- return;
- }
-
- // If we're included, then include the view
- // Otherwise do forward
- // This allow the page to, for example, set content type
- if (!response.isCommitted() && (request.getAttribute("javax.servlet.include.servlet_path") == null)) {
- request.setAttribute("ti.view_uri", finalLocation);
- request.setAttribute("ti.request_uri", request.getRequestURI());
-
- dispatcher.forward(request, response);
- } else {
- dispatcher.include(request, response);
- }
- //}
- }
-}
+/*
+ * Copyright (c) 2002-2003 by OpenSymphony
+ * All rights reserved.
+ */
+package org.apache.ti.servlet;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.chain.web.servlet.ServletWebContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ti.processor.BaseResult;
+import org.apache.ti.processor.ControllerContext;
+
+import com.opensymphony.xwork.ActionInvocation;
+
+/**
+ * Includes or forwards a view. There are three possible ways the result can be executed: <ul>
+ * <p/>
+ * <li>If we are in the scope of a JSP (a PageContext is available), PageContext's
+ * {@link PageContext#include(String) include} method is called.</li>
+ * <p/>
+ * <li>If there is no PageContext and we're not in any sort of include (there is no
+ * "javax.servlet.include.servlet_path" in the request attributes), then a call to
+ * {@link RequestDispatcher#forward(javax.servlet.ServletRequest, javax.servlet.ServletResponse) forward}
+ * is made.</li>
+ * <p/>
+ * <li>Otherwise, {@link RequestDispatcher#include(javax.servlet.ServletRequest, javax.servlet.ServletResponse) include}
+ * is called.</li></ul>
+ * <p/>
+ * This result follows the same rules from {@link WebWorkResultSupport}.
+ *
+ * @author Patrick Lightbody
+ * @see javax.servlet.RequestDispatcher
+ */
+public class ServletDispatcherResult extends BaseResult {
+ //~ Static fields/initializers /////////////////////////////////////////////
+
+ private static final Log log = LogFactory.getLog(ServletDispatcherResult.class);
+
+ //~ Methods ////////////////////////////////////////////////////////////////
+
+ /**
+ * Dispatches to the given location. Does its forward via a RequestDispatcher. If the
+ * dispatch fails a 404 error will be sent back in the http response.
+ *
+ * @param finalLocation the location to dispatch to.
+ * @param invocation the execution state of the action
+ * @throws Exception if an error occurs. If the dispatch fails the error will go back via the
+ * HTTP request.
+ */
+ public void doExecute(String finalLocation, ActionInvocation invocation) throws Exception {
+ if (log.isDebugEnabled()) {
+ log.debug("Forwarding to location " + finalLocation);
+ }
+
+ ServletWebContext ctx = (ServletWebContext) ControllerContext.getContext().getWebContext();
+
+ //PageContext pageContext = ServletActionContext.getPageContext();
+
+ //if (pageContext != null) {
+ // pageContext.include(finalLocation);
+ //} else {
+ HttpServletRequest request = ctx.getRequest();
+ HttpServletResponse response = ctx.getResponse();
+ RequestDispatcher dispatcher = request.getRequestDispatcher(finalLocation);
+
+ // if the view doesn't exist, let's do a 404
+ if (dispatcher == null) {
+ response.sendError(404, "result '" + finalLocation + "' not found");
+
+ return;
+ }
+
+ // If we're included, then include the view
+ // Otherwise do forward
+ // This allow the page to, for example, set content type
+ if (!response.isCommitted() && (request.getAttribute("javax.servlet.include.servlet_path") == null)) {
+ request.setAttribute("ti.view_uri", finalLocation);
+ request.setAttribute("ti.request_uri", request.getRequestURI());
+
+ dispatcher.forward(request, response);
+ } else {
+ dispatcher.include(request, response);
+ }
+ //}
+ }
+}
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/ServletDispatcherResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/ServletDispatcherResult.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/StrutsTiServlet.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/StrutsTiServlet.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/StrutsTiServlet.java (original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/StrutsTiServlet.java Thu Aug 4 21:13:44 2005
@@ -1,246 +1,246 @@
-/*
- * $Id$
- *
- * Copyright 2005 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.ti.servlet;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletException;
-import javax.servlet.UnavailableException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.chain.web.servlet.ServletWebContext;
-import org.apache.commons.digester.Digester;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ti.processor.RequestProcessor;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
-import org.springframework.core.io.UrlResource;
-import org.xml.sax.SAXException;
-
-/**
- * <p><strong>StrutsTiServlet</strong> is the entry point into Struts Ti.</p>
- * @version $Rev: 170184 $ $Date: 2005-05-14 16:54:24 -0700 (Sat, 14 May 2005) $
- */
-public class StrutsTiServlet extends HttpServlet {
-
- public static final String SERVLET_MAPPINGS_KEY = "servletMappings";
-
- protected String springConfig = "org/apache/ti/config/spring-config-servlet.xml";
-
- protected static Log log = LogFactory.getLog(StrutsTiServlet.class);
-
- protected BeanFactory beanFactory = null;
- protected List servletMappings = new ArrayList();
- protected RequestProcessor processor = null;
-
- public void destroy() {
-
- processor.destroy();
- beanFactory = null;
- processor = null;
- }
-
-
-
- /**
- * <p>Initialize this servlet. Most of the processing has been factored
- * into support methods so that you can override particular functionality
- * at a fairly granular level.</p>
- *
- * @exception ServletException if we cannot configure ourselves correctly
- */
- public void init() throws ServletException {
- super.init();
-
- initSpring();
- initServlet();
-
- Map initParameters = new HashMap();
- String key;
- for (Enumeration e = getInitParameterNames(); e.hasMoreElements(); ) {
- key = (String) e.nextElement();
- initParameters.put(key, getInitParameter(key));
- }
- initParameters.put(SERVLET_MAPPINGS_KEY, servletMappings);
-
- processor = (RequestProcessor) beanFactory.getBean("requestProcessor");
- processor.init(initParameters, new ServletWebContext(getServletContext(), null, null));
- }
-
- protected void initSpring() throws ServletException {
- // Parse the configuration file specified by path or resource
- try {
- String paths = getInitParameter("springConfig");
- if (paths != null) {
- springConfig = paths;
- }
-
- URL resource = resolve(springConfig);
- log.info("Loading spring configuration from " + resource);
- beanFactory = new XmlBeanFactory(new UrlResource(resource));
- } catch (Exception e) {
- String msg = "Exception loading spring configuration";
- log.error(msg, e);
- throw new UnavailableException(msg);
- }
- }
-
-
- /**
- * <p>Perform the standard request processing for this request, and create
- * the corresponding response.</p>
- *
- * @param request The servlet request we are processing
- * @param response The servlet response we are creating
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception is thrown
- */
- public void service(HttpServletRequest request,
- HttpServletResponse response) throws ServletException {
-
- processor.process(new ServletWebContext(getServletContext(), request, response));
- }
-
-
- protected URL resolve(String path) throws ServletException {
- URL resource = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- if (loader == null) {
- loader = this.getClass().getClassLoader();
- }
-
- try {
- if (path.charAt(0) == '/') {
- resource = getServletContext().getResource(path);
- }
-
- if (resource == null) {
- if (log.isDebugEnabled()) {
- log.debug("Unable to locate " + path
- + " in the servlet context, "
- + "trying classloader.");
- }
- Enumeration e = loader.getResources(path);
- if (!e.hasMoreElements()) {
- String msg = "Resource not found: "+path;
- log.error(msg);
- throw new UnavailableException(msg);
- } else {
- resource = (URL) e.nextElement();
- if (e.hasMoreElements()) {
- log.warn("Found more than one resource at "+path
- +", only using the first");
- }
- }
- }
- } catch (Exception e) {
- log.error(e);
- throw new UnavailableException("Unable to load resource at "+path);
- }
-
- return resource;
- }
-
- /**
- * <p>Remember a servlet mapping from our web application deployment
- * descriptor, if it is for this servlet.</p>
- *
- * @param servletName The name of the servlet being mapped
- * @param urlPattern The URL pattern to which this servlet is mapped
- */
- public void addServletMapping(String servletName, String urlPattern) {
-
- if (log.isDebugEnabled()) {
- log.debug("Process servletName=" + servletName
- + ", urlPattern=" + urlPattern);
- }
- String myServletName = getServletConfig().getServletName();
-
- if (servletName != null && servletName.equals(myServletName)) {
- servletMappings.add(urlPattern);
- }
-
- }
-
- /**
- * <p>Initialize the servlet mapping under which our controller servlet
- * is being accessed. This will be used in the <code>&html:form></code>
- * tag to generate correct destination URLs for form submissions.</p>
- *
- * @throws ServletException if error happens while scanning web.xml
- */
- protected void initServlet() throws ServletException {
-
- // Prepare a Digester to scan the web application deployment descriptor
- Digester digester = new Digester();
- digester.push(this);
- digester.setNamespaceAware(true);
- digester.setValidating(false);
-
- // Configure the processing rules that we need
- digester.addCallMethod("web-app/servlet-mapping",
- "addServletMapping", 2);
- digester.addCallParam("web-app/servlet-mapping/servlet-name", 0);
- digester.addCallParam("web-app/servlet-mapping/url-pattern", 1);
-
- // Process the web application deployment descriptor
- if (log.isDebugEnabled()) {
- log.debug("Scanning web.xml for controller servlet mapping");
- }
-
- InputStream input =
- getServletContext().getResourceAsStream("/WEB-INF/web.xml");
-
- String err = "Unable to process web.xml";
- if (input == null) {
- throw new ServletException(err);
- }
-
- try {
- digester.parse(input);
-
- } catch (IOException e) {
- log.error(err, e);
- throw new ServletException(e);
-
- } catch (SAXException e) {
- log.error(err, e);
- throw new ServletException(e);
-
- } finally {
- try {
- input.close();
- } catch (IOException e) {
- log.error(err, e);
- throw new ServletException(e);
- }
- }
- }
-
-}
+/*
+ * $Id$
+ *
+ * Copyright 2005 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.ti.servlet;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.UnavailableException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.chain.web.servlet.ServletWebContext;
+import org.apache.commons.digester.Digester;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ti.processor.RequestProcessor;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.core.io.UrlResource;
+import org.xml.sax.SAXException;
+
+/**
+ * <p><strong>StrutsTiServlet</strong> is the entry point into Struts Ti.</p>
+ * @version $Rev$ $Date$
+ */
+public class StrutsTiServlet extends HttpServlet {
+
+ public static final String SERVLET_MAPPINGS_KEY = "servletMappings";
+
+ protected String springConfig = "org/apache/ti/config/spring-config-servlet.xml";
+
+ protected static Log log = LogFactory.getLog(StrutsTiServlet.class);
+
+ protected BeanFactory beanFactory = null;
+ protected List servletMappings = new ArrayList();
+ protected RequestProcessor processor = null;
+
+ public void destroy() {
+
+ processor.destroy();
+ beanFactory = null;
+ processor = null;
+ }
+
+
+
+ /**
+ * <p>Initialize this servlet. Most of the processing has been factored
+ * into support methods so that you can override particular functionality
+ * at a fairly granular level.</p>
+ *
+ * @exception ServletException if we cannot configure ourselves correctly
+ */
+ public void init() throws ServletException {
+ super.init();
+
+ initSpring();
+ initServlet();
+
+ Map initParameters = new HashMap();
+ String key;
+ for (Enumeration e = getInitParameterNames(); e.hasMoreElements(); ) {
+ key = (String) e.nextElement();
+ initParameters.put(key, getInitParameter(key));
+ }
+ initParameters.put(SERVLET_MAPPINGS_KEY, servletMappings);
+
+ processor = (RequestProcessor) beanFactory.getBean("requestProcessor");
+ processor.init(initParameters, new ServletWebContext(getServletContext(), null, null));
+ }
+
+ protected void initSpring() throws ServletException {
+ // Parse the configuration file specified by path or resource
+ try {
+ String paths = getInitParameter("springConfig");
+ if (paths != null) {
+ springConfig = paths;
+ }
+
+ URL resource = resolve(springConfig);
+ log.info("Loading spring configuration from " + resource);
+ beanFactory = new XmlBeanFactory(new UrlResource(resource));
+ } catch (Exception e) {
+ String msg = "Exception loading spring configuration";
+ log.error(msg, e);
+ throw new UnavailableException(msg);
+ }
+ }
+
+
+ /**
+ * <p>Perform the standard request processing for this request, and create
+ * the corresponding response.</p>
+ *
+ * @param request The servlet request we are processing
+ * @param response The servlet response we are creating
+ *
+ * @exception IOException if an input/output error occurs
+ * @exception ServletException if a servlet exception is thrown
+ */
+ public void service(HttpServletRequest request,
+ HttpServletResponse response) throws ServletException {
+
+ processor.process(new ServletWebContext(getServletContext(), request, response));
+ }
+
+
+ protected URL resolve(String path) throws ServletException {
+ URL resource = null;
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ if (loader == null) {
+ loader = this.getClass().getClassLoader();
+ }
+
+ try {
+ if (path.charAt(0) == '/') {
+ resource = getServletContext().getResource(path);
+ }
+
+ if (resource == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to locate " + path
+ + " in the servlet context, "
+ + "trying classloader.");
+ }
+ Enumeration e = loader.getResources(path);
+ if (!e.hasMoreElements()) {
+ String msg = "Resource not found: "+path;
+ log.error(msg);
+ throw new UnavailableException(msg);
+ } else {
+ resource = (URL) e.nextElement();
+ if (e.hasMoreElements()) {
+ log.warn("Found more than one resource at "+path
+ +", only using the first");
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error(e);
+ throw new UnavailableException("Unable to load resource at "+path);
+ }
+
+ return resource;
+ }
+
+ /**
+ * <p>Remember a servlet mapping from our web application deployment
+ * descriptor, if it is for this servlet.</p>
+ *
+ * @param servletName The name of the servlet being mapped
+ * @param urlPattern The URL pattern to which this servlet is mapped
+ */
+ public void addServletMapping(String servletName, String urlPattern) {
+
+ if (log.isDebugEnabled()) {
+ log.debug("Process servletName=" + servletName
+ + ", urlPattern=" + urlPattern);
+ }
+ String myServletName = getServletConfig().getServletName();
+
+ if (servletName != null && servletName.equals(myServletName)) {
+ servletMappings.add(urlPattern);
+ }
+
+ }
+
+ /**
+ * <p>Initialize the servlet mapping under which our controller servlet
+ * is being accessed. This will be used in the <code>&html:form></code>
+ * tag to generate correct destination URLs for form submissions.</p>
+ *
+ * @throws ServletException if error happens while scanning web.xml
+ */
+ protected void initServlet() throws ServletException {
+
+ // Prepare a Digester to scan the web application deployment descriptor
+ Digester digester = new Digester();
+ digester.push(this);
+ digester.setNamespaceAware(true);
+ digester.setValidating(false);
+
+ // Configure the processing rules that we need
+ digester.addCallMethod("web-app/servlet-mapping",
+ "addServletMapping", 2);
+ digester.addCallParam("web-app/servlet-mapping/servlet-name", 0);
+ digester.addCallParam("web-app/servlet-mapping/url-pattern", 1);
+
+ // Process the web application deployment descriptor
+ if (log.isDebugEnabled()) {
+ log.debug("Scanning web.xml for controller servlet mapping");
+ }
+
+ InputStream input =
+ getServletContext().getResourceAsStream("/WEB-INF/web.xml");
+
+ String err = "Unable to process web.xml";
+ if (input == null) {
+ throw new ServletException(err);
+ }
+
+ try {
+ digester.parse(input);
+
+ } catch (IOException e) {
+ log.error(err, e);
+ throw new ServletException(e);
+
+ } catch (SAXException e) {
+ log.error(err, e);
+ throw new ServletException(e);
+
+ } finally {
+ try {
+ input.close();
+ } catch (IOException e) {
+ log.error(err, e);
+ throw new ServletException(e);
+ }
+ }
+ }
+
+}
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/StrutsTiServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/StrutsTiServlet.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/util/ServletSourceResolver.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/util/ServletSourceResolver.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/util/ServletSourceResolver.java (original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/util/ServletSourceResolver.java Thu Aug 4 21:13:44 2005
@@ -1,150 +1,150 @@
-/*
- * $Id$
- *
- * Copyright 2005 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.ti.util;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.chain.web.WebContext;
-import org.apache.commons.chain.web.servlet.ServletWebContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-
-/**
- * Source resolver that uses the servlet resource locator
- */
-public class ServletSourceResolver implements SourceResolver {
-
- /**
- * <p>Commons Logging instance.</p>
- */
- protected static Log log = LogFactory.getLog(ServletSourceResolver.class);
-
- public URL resolve(String path, WebContext context)
- throws IOException, MalformedURLException {
-
- List list = resolveList(path, context);
- if (list.size() > 0) {
- return (URL) list.get(0);
- } else {
- return null;
- }
- }
-
- public List resolveList(String path, WebContext context)
- throws IOException, MalformedURLException {
-
- ServletContext servletContext = ((ServletWebContext)context).getContext();
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- if (loader == null) {
- loader = this.getClass().getClassLoader();
- }
- ArrayList resolvedUrls = new ArrayList();
-
- URL resource = null;
- if (path != null && path.length() > 0) {
-
- if (path.charAt(0) == '/') {
- resource = servletContext.getResource(path);
- }
-
- if (resource == null) {
- if (log.isDebugEnabled()) {
- log.debug("Unable to locate " + path
- + " in the servlet context, "
- + "trying classloader.");
- }
- Enumeration e = loader.getResources(path);
- if (!e.hasMoreElements()) {
- String msg = "Resource not found: "+path;
- log.error(msg);
- throw new IOException(msg);
- } else {
- while (e.hasMoreElements()) {
- resolvedUrls.add(e.nextElement());
- }
- }
- } else {
- resolvedUrls.add(resource);
- }
- }
- return resolvedUrls;
- }
-
- public List resolveFromList(String paths, WebContext context)
- throws IOException, MalformedURLException {
-
- ServletContext servletContext = ((ServletWebContext)context).getContext();
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- if (loader == null) {
- loader = this.getClass().getClassLoader();
- }
- ArrayList resolvedUrls = new ArrayList();
-
- URL resource = null;
- String path = null;
- // Process each specified resource path
- while (paths.length() > 0) {
- int comma = paths.indexOf(',');
- if (comma >= 0) {
- path = paths.substring(0, comma).trim();
- paths = paths.substring(comma + 1);
- } else {
- path = paths.trim();
- paths = "";
- }
-
- if (path.length() < 1) {
- break;
- }
-
- if (path.charAt(0) == '/') {
- resource = servletContext.getResource(path);
- }
-
- if (resource == null) {
- if (log.isDebugEnabled()) {
- log.debug("Unable to locate " + path
- + " in the servlet context, "
- + "trying classloader.");
- }
- Enumeration e = loader.getResources(path);
- if (!e.hasMoreElements()) {
- String msg = "Resource not found: "+path;
- log.error(msg);
- throw new IOException(msg);
- } else {
- while (e.hasMoreElements()) {
- resolvedUrls.add(e.nextElement());
- }
- }
- } else {
- resolvedUrls.add(resource);
- }
- }
- return resolvedUrls;
- }
-
-}
+/*
+ * $Id$
+ *
+ * Copyright 2005 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.ti.util;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.chain.web.WebContext;
+import org.apache.commons.chain.web.servlet.ServletWebContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+/**
+ * Source resolver that uses the servlet resource locator
+ */
+public class ServletSourceResolver implements SourceResolver {
+
+ /**
+ * <p>Commons Logging instance.</p>
+ */
+ protected static Log log = LogFactory.getLog(ServletSourceResolver.class);
+
+ public URL resolve(String path, WebContext context)
+ throws IOException, MalformedURLException {
+
+ List list = resolveList(path, context);
+ if (list.size() > 0) {
+ return (URL) list.get(0);
+ } else {
+ return null;
+ }
+ }
+
+ public List resolveList(String path, WebContext context)
+ throws IOException, MalformedURLException {
+
+ ServletContext servletContext = ((ServletWebContext)context).getContext();
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ if (loader == null) {
+ loader = this.getClass().getClassLoader();
+ }
+ ArrayList resolvedUrls = new ArrayList();
+
+ URL resource = null;
+ if (path != null && path.length() > 0) {
+
+ if (path.charAt(0) == '/') {
+ resource = servletContext.getResource(path);
+ }
+
+ if (resource == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to locate " + path
+ + " in the servlet context, "
+ + "trying classloader.");
+ }
+ Enumeration e = loader.getResources(path);
+ if (!e.hasMoreElements()) {
+ String msg = "Resource not found: "+path;
+ log.error(msg);
+ throw new IOException(msg);
+ } else {
+ while (e.hasMoreElements()) {
+ resolvedUrls.add(e.nextElement());
+ }
+ }
+ } else {
+ resolvedUrls.add(resource);
+ }
+ }
+ return resolvedUrls;
+ }
+
+ public List resolveFromList(String paths, WebContext context)
+ throws IOException, MalformedURLException {
+
+ ServletContext servletContext = ((ServletWebContext)context).getContext();
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ if (loader == null) {
+ loader = this.getClass().getClassLoader();
+ }
+ ArrayList resolvedUrls = new ArrayList();
+
+ URL resource = null;
+ String path = null;
+ // Process each specified resource path
+ while (paths.length() > 0) {
+ int comma = paths.indexOf(',');
+ if (comma >= 0) {
+ path = paths.substring(0, comma).trim();
+ paths = paths.substring(comma + 1);
+ } else {
+ path = paths.trim();
+ paths = "";
+ }
+
+ if (path.length() < 1) {
+ break;
+ }
+
+ if (path.charAt(0) == '/') {
+ resource = servletContext.getResource(path);
+ }
+
+ if (resource == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to locate " + path
+ + " in the servlet context, "
+ + "trying classloader.");
+ }
+ Enumeration e = loader.getResources(path);
+ if (!e.hasMoreElements()) {
+ String msg = "Resource not found: "+path;
+ log.error(msg);
+ throw new IOException(msg);
+ } else {
+ while (e.hasMoreElements()) {
+ resolvedUrls.add(e.nextElement());
+ }
+ }
+ } else {
+ resolvedUrls.add(resource);
+ }
+ }
+ return resolvedUrls;
+ }
+
+}
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/util/ServletSourceResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/util/ServletSourceResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/util/SourceResolver.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/util/SourceResolver.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/util/SourceResolver.java (original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/util/SourceResolver.java Thu Aug 4 21:13:44 2005
@@ -1,39 +1,39 @@
-/*
- * $Id$
- *
- * Copyright 2005 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.ti.util;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-
-import org.apache.commons.chain.web.WebContext;
-
-
-/**
- * Resovles resources
- */
-public interface SourceResolver {
-
- public URL resolve(String path, WebContext context) throws IOException, MalformedURLException;
-
- public List resolveList(String path, WebContext context) throws IOException, MalformedURLException;
-
- public List resolveFromList(String paths, WebContext context) throws IOException, MalformedURLException;
-
-}
+/*
+ * $Id$
+ *
+ * Copyright 2005 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.ti.util;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+
+import org.apache.commons.chain.web.WebContext;
+
+
+/**
+ * Resovles resources
+ */
+public interface SourceResolver {
+
+ public URL resolve(String path, WebContext context) throws IOException, MalformedURLException;
+
+ public List resolveList(String path, WebContext context) throws IOException, MalformedURLException;
+
+ public List resolveFromList(String paths, WebContext context) throws IOException, MalformedURLException;
+
+}
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/util/SourceResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/java/org/apache/ti/util/SourceResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestProcessTags.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestProcessTags.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestProcessTags.java (original)
+++ struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestProcessTags.java Thu Aug 4 21:13:44 2005
@@ -1,5 +1,5 @@
/*
- * $Id: TestProcessTags.java 171041 2005-05-20 03:50:06Z jmitchell $
+ * $Id$
*
* Copyright 2002-2004 The Apache Software Foundation.
*
@@ -31,7 +31,7 @@
/**
* Unit tests for the <code>org.apache.ti.config.ProcessTags</code> class.
*
- * @version $Rev: 171041 $ $Date: 2005-05-19 20:50:06 -0700 (Thu, 19 May 2005) $
+ * @version $Rev$ $Date$
*/
public class TestProcessTags extends TestCase {
Propchange: struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestProcessTags.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestProcessTags.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletParser.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletParser.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletParser.java (original)
+++ struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletParser.java Thu Aug 4 21:13:44 2005
@@ -1,5 +1,5 @@
/*
- * $Id: TestXDocletParser.java 171041 2005-05-20 03:50:06Z jmitchell $
+ * $Id$
*
* Copyright 2002-2004 The Apache Software Foundation.
*
@@ -34,7 +34,7 @@
/**
* Unit tests for the <code>org.apache.ti.config.XDocletParser</code> class.
*
- * @version $Rev: 171041 $ $Date: 2005-05-19 20:50:06 -0700 (Thu, 19 May 2005) $
+ * @version $Rev$ $Date$
*/
public class TestXDocletParser extends TestCase {
Propchange: struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletParser.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/test/org/apache/ti/config/mapper/TestServletActionMapper.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/test/org/apache/ti/config/mapper/TestServletActionMapper.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/test/org/apache/ti/config/mapper/TestServletActionMapper.java (original)
+++ struts/sandbox/trunk/ti/src/test/org/apache/ti/config/mapper/TestServletActionMapper.java Thu Aug 4 21:13:44 2005
@@ -1,5 +1,5 @@
/*
- * $Id: TestServletActionMapper.java 171041 2005-05-20 03:50:06Z jmitchell $
+ * $Id$
*
* Copyright 2002-2004 The Apache Software Foundation.
*
@@ -28,7 +28,7 @@
/**
* Unit tests for the <code>org.apache.ti.config.ServletActionMapper</code> class.
*
- * @version $Rev: 171041 $ $Date: 2005-05-19 20:50:06 -0700 (Thu, 19 May 2005) $
+ * @version $Rev$ $Date$
*/
public class TestServletActionMapper extends TestCase {
Propchange: struts/sandbox/trunk/ti/src/test/org/apache/ti/config/mapper/TestServletActionMapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/test/org/apache/ti/config/mapper/TestServletActionMapper.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/Bean.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/Bean.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/Bean.java (original)
+++ struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/Bean.java Thu Aug 4 21:13:44 2005
@@ -1,5 +1,5 @@
/*
- * $Id: TestSpringConfigRuleSet.java 171041 2005-05-20 03:50:06Z jmitchell $
+ * $Id$
*
* Copyright 2002-2004 The Apache Software Foundation.
*
Propchange: struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/Bean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/Bean.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/TestSpringConfigRuleSet.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/TestSpringConfigRuleSet.java?rev=230394&r1=230393&r2=230394&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/TestSpringConfigRuleSet.java (original)
+++ struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/TestSpringConfigRuleSet.java Thu Aug 4 21:13:44 2005
@@ -1,5 +1,5 @@
/*
- * $Id: TestSpringConfigRuleSet.java 171041 2005-05-20 03:50:06Z jmitchell $
+ * $Id$
*
* Copyright 2002-2004 The Apache Software Foundation.
*
@@ -31,7 +31,7 @@
/**
* Unit tests for the <code>org.apache.ti.config.SpringConfigRuleSet</code> class.
*
- * @version $Rev: 171041 $ $Date: 2005-05-19 20:50:06 -0700 (Thu, 19 May 2005) $
+ * @version $Rev$ $Date$
*/
public class TestSpringConfigRuleSet extends TestCase {
Propchange: struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/TestSpringConfigRuleSet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/TestSpringConfigRuleSet.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org