You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/05/10 17:54:24 UTC
svn commit: r405785 [6/20] - in /beehive/trunk/netui: external/struts/
external/struts/legacy/jakarta-struts-1.1-lib/ src/bootstrap/
src/bootstrap/org/apache/beehive/netui/tools/tld/xdoclet/ src/compiler-apt/
src/compiler-apt/META-INF/services/ src/com...
Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java Wed May 10 08:49:42 2006
@@ -1,62 +1,62 @@
-/*
- * Copyright 2004 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.
- *
- * $Header:$
- */
-package org.apache.beehive.netui.tags.rendering;
-
-import org.apache.beehive.netui.util.internal.InternalStringBuilder;
-
-/**
- * This is an implementation of {@link AbstractRenderAppender} which appends
- * Strings to a {@link InternalStringBuilder}
- */
-public class StringBuilderRenderAppender
- extends AbstractRenderAppender
-{
- private InternalStringBuilder _sb;
-
- public StringBuilderRenderAppender()
- {
- }
-
- public StringBuilderRenderAppender(InternalStringBuilder sb)
- {
- _sb = sb;
- }
-
- public void setInternalStringBuilder(InternalStringBuilder sb)
- {
- _sb = sb;
- }
-
- public void append(String s)
- {
- assert _sb != null : "Render appender doesn't have a valid string builder";
- _sb.append(s);
- }
-
- public void append(char c)
- {
- assert _sb != null : "Render appender doesn't have a valid string builder";
- _sb.append(c);
- }
-
- public String toString()
- {
- assert _sb != null : "Render appender doesn't have a valid string builder";
- return _sb.toString();
- }
-}
+/*
+ * Copyright 2004 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.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.tags.rendering;
+
+import org.apache.beehive.netui.util.internal.InternalStringBuilder;
+
+/**
+ * This is an implementation of {@link AbstractRenderAppender} which appends
+ * Strings to a {@link InternalStringBuilder}
+ */
+public class StringBuilderRenderAppender
+ extends AbstractRenderAppender
+{
+ private InternalStringBuilder _sb;
+
+ public StringBuilderRenderAppender()
+ {
+ }
+
+ public StringBuilderRenderAppender(InternalStringBuilder sb)
+ {
+ _sb = sb;
+ }
+
+ public void setInternalStringBuilder(InternalStringBuilder sb)
+ {
+ _sb = sb;
+ }
+
+ public void append(String s)
+ {
+ assert _sb != null : "Render appender doesn't have a valid string builder";
+ _sb.append(s);
+ }
+
+ public void append(char c)
+ {
+ assert _sb != null : "Render appender doesn't have a valid string builder";
+ _sb.append(c);
+ }
+
+ public String toString()
+ {
+ assert _sb != null : "Render appender doesn't have a valid string builder";
+ return _sb.toString();
+ }
+}
Propchange: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/WriteRenderAppender.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/WriteRenderAppender.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/WriteRenderAppender.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/WriteRenderAppender.java Wed May 10 08:49:42 2006
@@ -1,62 +1,62 @@
-package org.apache.beehive.netui.tags.rendering;
-
-import org.apache.beehive.netui.util.Bundle;
-import org.apache.beehive.netui.util.logging.Logger;
-import org.apache.struts.util.RequestUtils;
-
-import javax.servlet.jsp.JspContext;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
-import java.io.IOException;
-
-public class WriteRenderAppender extends AbstractRenderAppender
-{
- private static final Logger logger = Logger.getInstance(WriteRenderAppender.class);
-
- private JspContext _jspC;
-
- public WriteRenderAppender()
- {
- }
-
- public WriteRenderAppender(JspContext jspC)
- {
- _jspC = jspC;
- }
-
- public void setPageContext(JspContext jspC)
- {
- _jspC = jspC;
- }
-
- public void append(String s)
- {
- JspWriter writer = _jspC.getOut();
- try {
- writer.print(s);
- }
- catch (IOException e) {
- if (_jspC instanceof PageContext)
- RequestUtils.saveException((PageContext) _jspC, e);
- logger.error(Bundle.getString("Tags_WriteException"), e);
- }
- }
-
- /**
- * This is a method not found on ResponseUtils and one that should be there.
- * @param c
- */
- public void append(char c)
- {
- JspWriter writer = _jspC.getOut();
- try {
- writer.print(c);
- }
- catch (IOException e) {
- if (_jspC instanceof PageContext)
- RequestUtils.saveException((PageContext) _jspC, e);
- logger.error(Bundle.getString("Tags_WriteException"), e);
- }
- }
-
-}
+package org.apache.beehive.netui.tags.rendering;
+
+import org.apache.beehive.netui.util.Bundle;
+import org.apache.beehive.netui.util.logging.Logger;
+import org.apache.struts.util.RequestUtils;
+
+import javax.servlet.jsp.JspContext;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
+import java.io.IOException;
+
+public class WriteRenderAppender extends AbstractRenderAppender
+{
+ private static final Logger logger = Logger.getInstance(WriteRenderAppender.class);
+
+ private JspContext _jspC;
+
+ public WriteRenderAppender()
+ {
+ }
+
+ public WriteRenderAppender(JspContext jspC)
+ {
+ _jspC = jspC;
+ }
+
+ public void setPageContext(JspContext jspC)
+ {
+ _jspC = jspC;
+ }
+
+ public void append(String s)
+ {
+ JspWriter writer = _jspC.getOut();
+ try {
+ writer.print(s);
+ }
+ catch (IOException e) {
+ if (_jspC instanceof PageContext)
+ RequestUtils.saveException((PageContext) _jspC, e);
+ logger.error(Bundle.getString("Tags_WriteException"), e);
+ }
+ }
+
+ /**
+ * This is a method not found on ResponseUtils and one that should be there.
+ * @param c
+ */
+ public void append(char c)
+ {
+ JspWriter writer = _jspC.getOut();
+ try {
+ writer.print(c);
+ }
+ catch (IOException e) {
+ if (_jspC instanceof PageContext)
+ RequestUtils.saveException((PageContext) _jspC, e);
+ logger.error(Bundle.getString("Tags_WriteException"), e);
+ }
+ }
+
+}
Propchange: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/WriteRenderAppender.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java Wed May 10 08:49:42 2006
@@ -1,100 +1,100 @@
-/*
- * Copyright 2004 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.
- *
- * $Header:$
- */
-package org.apache.beehive.netui.tags.tree;
-
-import org.apache.beehive.netui.pageflow.requeststate.INameable;
-
-import javax.servlet.ServletRequest;
-
-/**
- * This interface provides additional behavior on the root node in a tree. There
- * are certain optimizations that may be done if state is tracked in the root.
- * In addition, there are a number of features that are only applied to the root
- * such as images. Finally, when the tree is run on the client, there are
- * additonal features required of the root.
- *
- * This is a pretty simple interface to implement. Mostly the there are only
- * properties that are stored for the additional state. The only method that
- * is complicated is the <code>changeSelected</code> method.
- */
-public interface ITreeRootElement extends INameable
-{
- /**
- * Change the node that is selected. This is an optimization were the
- * root node can track which node is currently selected so it can unselect
- * that node instead of searching the whole tree to find the selected node.
- *
- * There is a helper method <code>TreeHelpers.changeSelected</code> that can
- * be used for delegation. This requires the root, the currently selected node,
- * and will return the newly selected node.
- * @param selectNode a String value name of the new node selected
- * @param request the ServletRequest.
- */
- void changeSelected(String selectNode, ServletRequest request);
-
- /**
- * Return the currently selected <code>TreeElement</code>. This method
- * will return null if no element is currently selected.
- * @return the currently selected node.
- */
- TreeElement getSelectedNode();
-
- /**
- * return the TreeRenderState for this tree.
- * @return TreeRenderState
- */
- TreeRenderState getTreeRenderState();
-
- /**
- * Set the TreeRenderState
- * @param trs
- */
- void setTreeRenderState(TreeRenderState trs);
-
- /**
- * Property that returns the InheritableState that was set on the Tree.
- * @return InheritableState
- */
- InheritableState getInheritableState();
-
- /**
- * Property that sets the InheritableState that is set on the Tree tag.
- * @param state
- */
- void setInheritableState(InheritableState state);
-
- /**
- * @return String
- */
- String getRootNodeExpandedImage();
-
- /**
- * @param rootNodeExpandedImage
- */
- void setRootNodeExpandedImage(String rootNodeExpandedImage);
-
- /**
- * @return String
- */
- String getRootNodeCollapsedImage();
-
- /**
- * @param rootNodeCollapsedImage
- */
- void setRootNodeCollapsedImage(String rootNodeCollapsedImage);
-}
+/*
+ * Copyright 2004 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.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.tags.tree;
+
+import org.apache.beehive.netui.pageflow.requeststate.INameable;
+
+import javax.servlet.ServletRequest;
+
+/**
+ * This interface provides additional behavior on the root node in a tree. There
+ * are certain optimizations that may be done if state is tracked in the root.
+ * In addition, there are a number of features that are only applied to the root
+ * such as images. Finally, when the tree is run on the client, there are
+ * additonal features required of the root.
+ *
+ * This is a pretty simple interface to implement. Mostly the there are only
+ * properties that are stored for the additional state. The only method that
+ * is complicated is the <code>changeSelected</code> method.
+ */
+public interface ITreeRootElement extends INameable
+{
+ /**
+ * Change the node that is selected. This is an optimization were the
+ * root node can track which node is currently selected so it can unselect
+ * that node instead of searching the whole tree to find the selected node.
+ *
+ * There is a helper method <code>TreeHelpers.changeSelected</code> that can
+ * be used for delegation. This requires the root, the currently selected node,
+ * and will return the newly selected node.
+ * @param selectNode a String value name of the new node selected
+ * @param request the ServletRequest.
+ */
+ void changeSelected(String selectNode, ServletRequest request);
+
+ /**
+ * Return the currently selected <code>TreeElement</code>. This method
+ * will return null if no element is currently selected.
+ * @return the currently selected node.
+ */
+ TreeElement getSelectedNode();
+
+ /**
+ * return the TreeRenderState for this tree.
+ * @return TreeRenderState
+ */
+ TreeRenderState getTreeRenderState();
+
+ /**
+ * Set the TreeRenderState
+ * @param trs
+ */
+ void setTreeRenderState(TreeRenderState trs);
+
+ /**
+ * Property that returns the InheritableState that was set on the Tree.
+ * @return InheritableState
+ */
+ InheritableState getInheritableState();
+
+ /**
+ * Property that sets the InheritableState that is set on the Tree tag.
+ * @param state
+ */
+ void setInheritableState(InheritableState state);
+
+ /**
+ * @return String
+ */
+ String getRootNodeExpandedImage();
+
+ /**
+ * @param rootNodeExpandedImage
+ */
+ void setRootNodeExpandedImage(String rootNodeExpandedImage);
+
+ /**
+ * @return String
+ */
+ String getRootNodeCollapsedImage();
+
+ /**
+ * @param rootNodeCollapsedImage
+ */
+ void setRootNodeCollapsedImage(String rootNodeCollapsedImage);
+}
Propchange: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ServletTreeRenderSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TagTreeRenderSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderState.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ServerDefinition.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ServerDefinition.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ServerDefinition.java (original)
+++ beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ServerDefinition.java Wed May 10 08:49:42 2006
@@ -1,116 +1,116 @@
-/*
- * Copyright 2004 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.
- *
- * $Header:$
- */
-
-package org.apache.beehive.netui.tools.testrecorder.shared.config;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-
-import org.apache.beehive.netui.tools.testrecorder.shared.util.StringHelper;
-
-/**
- * Client side object that defines server access info.
- */
-public class ServerDefinition {
-
- private String name;
- private String hostname;
- private int port;
- private List webappList;
- private Map webappMap;
- private Map testDefMap;
- private List testDefList;
-
- public ServerDefinition( String name, String hostname, int port ) {
- this.name = name;
- this.hostname = hostname;
- this.port = port;
- webappList = new ArrayList();
- webappMap = new HashMap();
- testDefMap = new HashMap();
- testDefList = new ArrayList();
- }
-
- public void addWebapp( WebappDefinition webapp ) {
- webappList.add( webapp );
- webappMap.put( webapp.getName(), webapp );
- }
-
- public WebappDefinition getWebapp( String webappName ) {
- return (WebappDefinition) webappMap.get( webappName );
- }
-
- public WebappDefinition[] getWebapps() {
- return (WebappDefinition[]) webappList.toArray( new WebappDefinition[webappList.size()] );
- }
-
- public int getWebappCount() {
- return webappList.size();
- }
-
- public void addTestDefinitions( WebappDefinition webapp, TestDefinitions tests ) {
- testDefMap.put( webapp, tests );
- testDefList.add( tests );
- }
-
- public TestDefinitions getTestDefinitions( String webappName ) throws ConfigException {
- WebappDefinition webapp = getWebapp( webappName );
- if ( webapp == null ) {
- throw new ConfigException( "No webapp exists for webapp with name( " + webappName );
- }
- return getTestDefinitions( webapp );
- }
-
- public TestDefinitions getTestDefinitions( WebappDefinition webapp ) {
- return (TestDefinitions) testDefMap.get( webapp );
- }
-
- public TestDefinitions[] getTestDefinitions() {
- return (TestDefinitions[]) testDefList.toArray( new TestDefinitions[testDefList.size()] );
- }
-
- public int getTestDefinitionsCount() {
- return testDefList.size();
- }
-
- public String getName() {
- return name;
- }
-
- public String getHostname() {
- return hostname;
- }
-
- public int getPort() {
- return port;
- }
-
- public String toString() {
- StringBuffer sb = new StringBuffer( 48 );
- sb.append( "[ " );
- sb.append( "name( " + getName() + " )" );
- sb.append( ", hostname( " + getHostname() + " )" );
- sb.append( ", port( " + getPort() + " )" );
- sb.append( ", webappList( " + StringHelper.toString( webappList, "\n", "\n\t" ) + " )" );
- sb.append( " ]" );
- return sb.toString();
- }
-
-}
+/*
+ * Copyright 2004 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.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.netui.tools.testrecorder.shared.config;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+
+import org.apache.beehive.netui.tools.testrecorder.shared.util.StringHelper;
+
+/**
+ * Client side object that defines server access info.
+ */
+public class ServerDefinition {
+
+ private String name;
+ private String hostname;
+ private int port;
+ private List webappList;
+ private Map webappMap;
+ private Map testDefMap;
+ private List testDefList;
+
+ public ServerDefinition( String name, String hostname, int port ) {
+ this.name = name;
+ this.hostname = hostname;
+ this.port = port;
+ webappList = new ArrayList();
+ webappMap = new HashMap();
+ testDefMap = new HashMap();
+ testDefList = new ArrayList();
+ }
+
+ public void addWebapp( WebappDefinition webapp ) {
+ webappList.add( webapp );
+ webappMap.put( webapp.getName(), webapp );
+ }
+
+ public WebappDefinition getWebapp( String webappName ) {
+ return (WebappDefinition) webappMap.get( webappName );
+ }
+
+ public WebappDefinition[] getWebapps() {
+ return (WebappDefinition[]) webappList.toArray( new WebappDefinition[webappList.size()] );
+ }
+
+ public int getWebappCount() {
+ return webappList.size();
+ }
+
+ public void addTestDefinitions( WebappDefinition webapp, TestDefinitions tests ) {
+ testDefMap.put( webapp, tests );
+ testDefList.add( tests );
+ }
+
+ public TestDefinitions getTestDefinitions( String webappName ) throws ConfigException {
+ WebappDefinition webapp = getWebapp( webappName );
+ if ( webapp == null ) {
+ throw new ConfigException( "No webapp exists for webapp with name( " + webappName );
+ }
+ return getTestDefinitions( webapp );
+ }
+
+ public TestDefinitions getTestDefinitions( WebappDefinition webapp ) {
+ return (TestDefinitions) testDefMap.get( webapp );
+ }
+
+ public TestDefinitions[] getTestDefinitions() {
+ return (TestDefinitions[]) testDefList.toArray( new TestDefinitions[testDefList.size()] );
+ }
+
+ public int getTestDefinitionsCount() {
+ return testDefList.size();
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getHostname() {
+ return hostname;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public String toString() {
+ StringBuffer sb = new StringBuffer( 48 );
+ sb.append( "[ " );
+ sb.append( "name( " + getName() + " )" );
+ sb.append( ", hostname( " + getHostname() + " )" );
+ sb.append( ", port( " + getPort() + " )" );
+ sb.append( ", webappList( " + StringHelper.toString( webappList, "\n", "\n\t" ) + " )" );
+ sb.append( " ]" );
+ return sb.toString();
+ }
+
+}
Propchange: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ServerDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/WebappDefinition.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/WebappDefinition.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/WebappDefinition.java (original)
+++ beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/WebappDefinition.java Wed May 10 08:49:42 2006
@@ -1,74 +1,74 @@
-/*
- * Copyright 2004 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.
- *
- * $Header:$
- */
-
-package org.apache.beehive.netui.tools.testrecorder.shared.config;
-
-import org.apache.beehive.netui.tools.testrecorder.shared.util.StringHelper;
-import org.apache.beehive.netui.tools.testrecorder.shared.Logger;
-
-import java.io.File;
-
-/**
- * Client side object defining webapp access.
- * User: ozzy
- */
-public class WebappDefinition {
-
- private static final Logger log = Logger.getInstance( WebappDefinition.class );
-
- private String name;
- private String description;
- // includes leading slash
- private String contextRoot;
- private String servletUri;
-
- public WebappDefinition( String name, String description, String contextRoot, String servletUri) {
- this.name = name;
- this.description = description;
- this.contextRoot = contextRoot;
- this.servletUri = contextRoot + "/" + servletUri;
- }
-
- public String getName() {
- return name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public String getContextRoot() {
- return contextRoot;
- }
-
- public String getServletUri() {
- return servletUri;
- }
-
- public String toString() {
- StringBuffer sb = new StringBuffer( 256 );
- sb.append( "[ " );
- sb.append( "name( " + getName() + " )" );
- sb.append( ", description( " + getDescription() + " )" );
- sb.append( ", contextRoot( " + getContextRoot() + " )" );
- sb.append( ", servletURI( " + getServletUri() + " )" );
- sb.append( " ]" );
- return sb.toString();
- }
-
-}
+/*
+ * Copyright 2004 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.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.netui.tools.testrecorder.shared.config;
+
+import org.apache.beehive.netui.tools.testrecorder.shared.util.StringHelper;
+import org.apache.beehive.netui.tools.testrecorder.shared.Logger;
+
+import java.io.File;
+
+/**
+ * Client side object defining webapp access.
+ * User: ozzy
+ */
+public class WebappDefinition {
+
+ private static final Logger log = Logger.getInstance( WebappDefinition.class );
+
+ private String name;
+ private String description;
+ // includes leading slash
+ private String contextRoot;
+ private String servletUri;
+
+ public WebappDefinition( String name, String description, String contextRoot, String servletUri) {
+ this.name = name;
+ this.description = description;
+ this.contextRoot = contextRoot;
+ this.servletUri = contextRoot + "/" + servletUri;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public String getContextRoot() {
+ return contextRoot;
+ }
+
+ public String getServletUri() {
+ return servletUri;
+ }
+
+ public String toString() {
+ StringBuffer sb = new StringBuffer( 256 );
+ sb.append( "[ " );
+ sb.append( "name( " + getName() + " )" );
+ sb.append( ", description( " + getDescription() + " )" );
+ sb.append( ", contextRoot( " + getContextRoot() + " )" );
+ sb.append( ", servletURI( " + getServletUri() + " )" );
+ sb.append( " ]" );
+ return sb.toString();
+ }
+
+}
Propchange: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/WebappDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/schemas/testRecorderServer.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/tomcat-webapp/5.0.x/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tomcat-webapp/5.0.x/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/tomcat-webapp/5.0.x/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter (original)
+++ beehive/trunk/netui/src/tomcat-webapp/5.0.x/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter Wed May 10 08:49:42 2006
@@ -1 +1 @@
-org.apache.beehive.netui.tomcat.TomcatServletContainerAdapter
+org.apache.beehive.netui.tomcat.TomcatServletContainerAdapter
Propchange: beehive/trunk/netui/src/tomcat-webapp/5.0.x/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/tomcat-webapp/5.5.x/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tomcat-webapp/5.5.x/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/tomcat-webapp/5.5.x/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter (original)
+++ beehive/trunk/netui/src/tomcat-webapp/5.5.x/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter Wed May 10 08:49:42 2006
@@ -1 +1 @@
-org.apache.beehive.netui.tomcat.TomcatServletContainerAdapter
+org.apache.beehive.netui.tomcat.TomcatServletContainerAdapter
Propchange: beehive/trunk/netui/src/tomcat-webapp/5.5.x/META-INF/services/org.apache.beehive.netui.pageflow.ServletContainerAdapter
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/CatalogConfig.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/CatalogConfig.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/CatalogConfig.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/CatalogConfig.java Wed May 10 08:49:42 2006
@@ -1,50 +1,50 @@
-/*
- * 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.
- *
- * $Header:$
- */
-package org.apache.beehive.netui.util.config.bean;
-
-import java.util.List;
-import java.util.LinkedList;
-
-/**
- *
- */
-public class CatalogConfig {
-
- private String _name = null;
- private LinkedList _chains;
-
- public CatalogConfig() {
- _chains = new LinkedList();
- }
-
- public void addCommand(CommandConfig commandConfig) {
- _chains.add(commandConfig);
- }
-
- public List getCommands() {
- return _chains;
- }
-
- public String getName() {
- return _name;
- }
-
- public void setName(String name) {
- _name = name;
- }
-}
+/*
+ * 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.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.util.config.bean;
+
+import java.util.List;
+import java.util.LinkedList;
+
+/**
+ *
+ */
+public class CatalogConfig {
+
+ private String _name = null;
+ private LinkedList _chains;
+
+ public CatalogConfig() {
+ _chains = new LinkedList();
+ }
+
+ public void addCommand(CommandConfig commandConfig) {
+ _chains.add(commandConfig);
+ }
+
+ public List getCommands() {
+ return _chains;
+ }
+
+ public String getName() {
+ return _name;
+ }
+
+ public void setName(String name) {
+ _name = name;
+ }
+}
Propchange: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/CatalogConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/ChainConfig.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/ChainConfig.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/ChainConfig.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/ChainConfig.java Wed May 10 08:49:42 2006
@@ -1,56 +1,56 @@
-/*
- * 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.
- *
- * $Header:$
- */
-package org.apache.beehive.netui.util.config.bean;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- *
- */
-public class ChainConfig
- extends CommandConfig {
-
- private String _name = null;
- private LinkedList _commands = null;
-
- public ChainConfig() {
- _commands = new LinkedList();
- }
-
- public void addCommand(CommandConfig commandConfig) {
- _commands.add(commandConfig);
- }
-
- public List getCommands() {
- return _commands;
- }
-
- public void setCommands(List commands) {
- _commands.clear();
- _commands.addAll(commands);
- }
-
- public String getName() {
- return _name;
- }
-
- public void setName(String name) {
- _name = name;
- }
-}
+/*
+ * 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.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.util.config.bean;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ *
+ */
+public class ChainConfig
+ extends CommandConfig {
+
+ private String _name = null;
+ private LinkedList _commands = null;
+
+ public ChainConfig() {
+ _commands = new LinkedList();
+ }
+
+ public void addCommand(CommandConfig commandConfig) {
+ _commands.add(commandConfig);
+ }
+
+ public List getCommands() {
+ return _commands;
+ }
+
+ public void setCommands(List commands) {
+ _commands.clear();
+ _commands.addAll(commands);
+ }
+
+ public String getName() {
+ return _name;
+ }
+
+ public void setName(String name) {
+ _name = name;
+ }
+}
Propchange: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/ChainConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/CommandConfig.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/CommandConfig.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/CommandConfig.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/CommandConfig.java Wed May 10 08:49:42 2006
@@ -1,65 +1,65 @@
-/*
- * 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.
- *
- * $Header:$
- */
-package org.apache.beehive.netui.util.config.bean;
-
-import java.util.LinkedList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- *
- */
-public class CommandConfig {
-
- private String _id;
- private String _classname;
- private LinkedList _parameters;
-
- public CommandConfig() {
- _parameters = new LinkedList();
- }
-
- public void addParameter(CustomPropertyConfig customParameterConfig) {
- _parameters.add(customParameterConfig);
- }
-
- public String getId() {
- return _id;
- }
-
- public void setId(String id) {
- _id = id;
- }
-
- public String getClassname() {
- return _classname;
- }
-
- public void setClassname(String classname) {
- _classname = classname;
- }
-
- public List getParameters() {
- return _parameters != null ? _parameters : Collections.EMPTY_LIST;
- }
-
- public void setParameters(List parameters) {
- _parameters.clear();
- _parameters.addAll(parameters);
- }
+/*
+ * 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.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.util.config.bean;
+
+import java.util.LinkedList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ *
+ */
+public class CommandConfig {
+
+ private String _id;
+ private String _classname;
+ private LinkedList _parameters;
+
+ public CommandConfig() {
+ _parameters = new LinkedList();
+ }
+
+ public void addParameter(CustomPropertyConfig customParameterConfig) {
+ _parameters.add(customParameterConfig);
+ }
+
+ public String getId() {
+ return _id;
+ }
+
+ public void setId(String id) {
+ _id = id;
+ }
+
+ public String getClassname() {
+ return _classname;
+ }
+
+ public void setClassname(String classname) {
+ _classname = classname;
+ }
+
+ public List getParameters() {
+ return _parameters != null ? _parameters : Collections.EMPTY_LIST;
+ }
+
+ public void setParameters(List parameters) {
+ _parameters.clear();
+ _parameters.addAll(parameters);
+ }
}
Propchange: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/CommandConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/catalog/CatalogParser.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/catalog/CatalogParser.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/catalog/CatalogParser.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/catalog/CatalogParser.java Wed May 10 08:49:42 2006
@@ -1,174 +1,174 @@
-package org.apache.beehive.netui.util.config.internal.catalog;
-
-import java.io.InputStream;
-import java.io.IOException;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.beehive.netui.util.config.bean.CatalogConfig;
-import org.apache.beehive.netui.util.config.bean.CommandConfig;
-import org.apache.beehive.netui.util.config.bean.ChainConfig;
-import org.apache.beehive.netui.util.config.bean.CustomPropertyConfig;
-import org.apache.beehive.netui.util.xml.DomUtils;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.InputSource;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.SAXException;
-
-/**
- *
- */
-public class CatalogParser {
-
- private static final Log LOG = LogFactory.getLog(CatalogParser.class);
- private static final String CONFIG_SCHEMA = "org/apache/beehive/netui/util/config/internal/catalog/catalog-config.xsd";
- private static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
- private static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
- private static final String JAXP_SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
-
- public static CatalogParser getInstance() {
- return new CatalogParser();
- }
-
- private CatalogParser() {
- }
-
- public CatalogConfig parse(Element catalogElement) {
- return parseCatalog(catalogElement);
- }
-
- public CatalogConfig parse(final String resourcePath, final InputStream inputStream) {
- CatalogConfig catalogConfig = null;
- InputStream xmlInputStream = null;
- InputStream xsdInputStream = null;
- try {
- xmlInputStream = inputStream;
- xsdInputStream = getClass().getClassLoader().getResourceAsStream(CONFIG_SCHEMA);
-
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setValidating(true);
- dbf.setNamespaceAware(true);
- dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
- dbf.setAttribute(JAXP_SCHEMA_SOURCE, xsdInputStream);
-
- DocumentBuilder db = dbf.newDocumentBuilder();
- db.setErrorHandler(new ErrorHandler() {
- public void warning(SAXParseException exception) {
- LOG.info("Validation warning validating config file \"" + resourcePath +
- "\" against XML Schema \"" + CONFIG_SCHEMA);
- }
-
- public void error(SAXParseException exception) {
- throw new RuntimeException("Validation errors occurred parsing the config file \"" +
- resourcePath + "\". Cause: " + exception, exception);
- }
-
- public void fatalError(SAXParseException exception) {
- throw new RuntimeException("Validation errors occurred parsing the config file \"" +
- resourcePath + "\". Cause: " + exception, exception);
- }
- });
-
- db.setEntityResolver(new EntityResolver() {
- public InputSource resolveEntity(String publicId, String systemId) {
- if(systemId.endsWith("/catalog-config.xsd")) {
- InputStream inputStream = getClass().getClassLoader().getResourceAsStream(CONFIG_SCHEMA);
- return new InputSource(inputStream);
- }
- else return null;
- }
- });
-
- Document document = db.parse(xmlInputStream);
- Element catalogElement = document.getDocumentElement();
- catalogConfig = parse(catalogElement);
-
- }
- catch(ParserConfigurationException e) {
- throw new RuntimeException("Error occurred parsing the config file \"" + resourcePath + "\"", e);
- }
- catch(IOException e) {
- throw new RuntimeException("Error occurred parsing the config file \"" + resourcePath + "\"", e);
- }
- catch(SAXException e) {
- throw new RuntimeException("Error occurred parsing the config file \"" + resourcePath + "\"", e);
- }
- finally {
- try{if(xsdInputStream != null) xsdInputStream.close();}
- catch(IOException e) {}
- }
-
- return catalogConfig;
- }
-
- private static CatalogConfig parseCatalog(Element catalogElement) {
- CatalogConfig catalogConfig = null;
- if(catalogElement != null && catalogElement.hasChildNodes()) {
- catalogConfig = new CatalogConfig();
- NodeList nodeList = catalogElement.getChildNodes();
- if(nodeList != null) {
- for(int i = 0; i < nodeList.getLength(); i++) {
- Node node = nodeList.item(i);
- if(!(node.getNodeType() == Node.ELEMENT_NODE))
- continue;
-
- if(node.getNodeName().equals("chain")) {
- Element element = (Element)node;
- String name = element.getAttribute("name");
- ChainConfig chainConfig = new ChainConfig();
- chainConfig.setName(name);
-
- NodeList commandList = element.getElementsByTagName("command");
- if(commandList != null) {
- for(int j = 0; j < commandList.getLength(); j++) {
- Element commandElement = (Element)commandList.item(j);
- CommandConfig commandConfig = parseCommand(commandElement);
- chainConfig.addCommand(commandConfig);
- }
- }
- catalogConfig.addCommand(chainConfig);
- }
- else if(node.getNodeName().equals("command")) {
- Element element = (Element)node;
- CommandConfig commandConfig = parseCommand(element);
- catalogConfig.addCommand(commandConfig);
- }
- }
- }
- }
-
- return catalogConfig;
- }
-
- private static CommandConfig parseCommand(Element element) {
- assert element != null;
- assert element.getNodeName().equals("command");
-
- CommandConfig commandConfig = new CommandConfig();
- String id = DomUtils.getChildElementText(element, "id");
- String classname = DomUtils.getChildElementText(element, "command-class");
- commandConfig.setId(id);
- commandConfig.setClassname(classname);
-
- NodeList propertyList = element.getElementsByTagName("custom-property");
- if(propertyList != null) {
- for(int k = 0; k < propertyList.getLength(); k++) {
- Element propertyElement = (Element)propertyList.item(k);
- String propName = DomUtils.getChildElementText(propertyElement, "name");
- String propValue = DomUtils.getChildElementText(propertyElement, "value");
- CustomPropertyConfig propertyConfig = new CustomPropertyConfig(propName, propValue);
- commandConfig.addParameter(propertyConfig);
- }
- }
-
- return commandConfig;
- }
-}
+package org.apache.beehive.netui.util.config.internal.catalog;
+
+import java.io.InputStream;
+import java.io.IOException;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.beehive.netui.util.config.bean.CatalogConfig;
+import org.apache.beehive.netui.util.config.bean.CommandConfig;
+import org.apache.beehive.netui.util.config.bean.ChainConfig;
+import org.apache.beehive.netui.util.config.bean.CustomPropertyConfig;
+import org.apache.beehive.netui.util.xml.DomUtils;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Node;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.InputSource;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.SAXException;
+
+/**
+ *
+ */
+public class CatalogParser {
+
+ private static final Log LOG = LogFactory.getLog(CatalogParser.class);
+ private static final String CONFIG_SCHEMA = "org/apache/beehive/netui/util/config/internal/catalog/catalog-config.xsd";
+ private static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
+ private static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
+ private static final String JAXP_SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
+
+ public static CatalogParser getInstance() {
+ return new CatalogParser();
+ }
+
+ private CatalogParser() {
+ }
+
+ public CatalogConfig parse(Element catalogElement) {
+ return parseCatalog(catalogElement);
+ }
+
+ public CatalogConfig parse(final String resourcePath, final InputStream inputStream) {
+ CatalogConfig catalogConfig = null;
+ InputStream xmlInputStream = null;
+ InputStream xsdInputStream = null;
+ try {
+ xmlInputStream = inputStream;
+ xsdInputStream = getClass().getClassLoader().getResourceAsStream(CONFIG_SCHEMA);
+
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setValidating(true);
+ dbf.setNamespaceAware(true);
+ dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
+ dbf.setAttribute(JAXP_SCHEMA_SOURCE, xsdInputStream);
+
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ db.setErrorHandler(new ErrorHandler() {
+ public void warning(SAXParseException exception) {
+ LOG.info("Validation warning validating config file \"" + resourcePath +
+ "\" against XML Schema \"" + CONFIG_SCHEMA);
+ }
+
+ public void error(SAXParseException exception) {
+ throw new RuntimeException("Validation errors occurred parsing the config file \"" +
+ resourcePath + "\". Cause: " + exception, exception);
+ }
+
+ public void fatalError(SAXParseException exception) {
+ throw new RuntimeException("Validation errors occurred parsing the config file \"" +
+ resourcePath + "\". Cause: " + exception, exception);
+ }
+ });
+
+ db.setEntityResolver(new EntityResolver() {
+ public InputSource resolveEntity(String publicId, String systemId) {
+ if(systemId.endsWith("/catalog-config.xsd")) {
+ InputStream inputStream = getClass().getClassLoader().getResourceAsStream(CONFIG_SCHEMA);
+ return new InputSource(inputStream);
+ }
+ else return null;
+ }
+ });
+
+ Document document = db.parse(xmlInputStream);
+ Element catalogElement = document.getDocumentElement();
+ catalogConfig = parse(catalogElement);
+
+ }
+ catch(ParserConfigurationException e) {
+ throw new RuntimeException("Error occurred parsing the config file \"" + resourcePath + "\"", e);
+ }
+ catch(IOException e) {
+ throw new RuntimeException("Error occurred parsing the config file \"" + resourcePath + "\"", e);
+ }
+ catch(SAXException e) {
+ throw new RuntimeException("Error occurred parsing the config file \"" + resourcePath + "\"", e);
+ }
+ finally {
+ try{if(xsdInputStream != null) xsdInputStream.close();}
+ catch(IOException e) {}
+ }
+
+ return catalogConfig;
+ }
+
+ private static CatalogConfig parseCatalog(Element catalogElement) {
+ CatalogConfig catalogConfig = null;
+ if(catalogElement != null && catalogElement.hasChildNodes()) {
+ catalogConfig = new CatalogConfig();
+ NodeList nodeList = catalogElement.getChildNodes();
+ if(nodeList != null) {
+ for(int i = 0; i < nodeList.getLength(); i++) {
+ Node node = nodeList.item(i);
+ if(!(node.getNodeType() == Node.ELEMENT_NODE))
+ continue;
+
+ if(node.getNodeName().equals("chain")) {
+ Element element = (Element)node;
+ String name = element.getAttribute("name");
+ ChainConfig chainConfig = new ChainConfig();
+ chainConfig.setName(name);
+
+ NodeList commandList = element.getElementsByTagName("command");
+ if(commandList != null) {
+ for(int j = 0; j < commandList.getLength(); j++) {
+ Element commandElement = (Element)commandList.item(j);
+ CommandConfig commandConfig = parseCommand(commandElement);
+ chainConfig.addCommand(commandConfig);
+ }
+ }
+ catalogConfig.addCommand(chainConfig);
+ }
+ else if(node.getNodeName().equals("command")) {
+ Element element = (Element)node;
+ CommandConfig commandConfig = parseCommand(element);
+ catalogConfig.addCommand(commandConfig);
+ }
+ }
+ }
+ }
+
+ return catalogConfig;
+ }
+
+ private static CommandConfig parseCommand(Element element) {
+ assert element != null;
+ assert element.getNodeName().equals("command");
+
+ CommandConfig commandConfig = new CommandConfig();
+ String id = DomUtils.getChildElementText(element, "id");
+ String classname = DomUtils.getChildElementText(element, "command-class");
+ commandConfig.setId(id);
+ commandConfig.setClassname(classname);
+
+ NodeList propertyList = element.getElementsByTagName("custom-property");
+ if(propertyList != null) {
+ for(int k = 0; k < propertyList.getLength(); k++) {
+ Element propertyElement = (Element)propertyList.item(k);
+ String propName = DomUtils.getChildElementText(propertyElement, "name");
+ String propValue = DomUtils.getChildElementText(propertyElement, "value");
+ CustomPropertyConfig propertyConfig = new CustomPropertyConfig(propName, propValue);
+ commandConfig.addParameter(propertyConfig);
+ }
+ }
+
+ return commandConfig;
+ }
+}
Propchange: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/catalog/CatalogParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/catalog/catalog-config.xsd
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/catalog/catalog-config.xsd?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/catalog/catalog-config.xsd (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/catalog/catalog-config.xsd Wed May 10 08:49:42 2006
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- 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.
-
- $Header:$
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://beehive.apache.org/netui/2006/server/catalog"
- xmlns:netui="http://beehive.apache.org/netui/2006/server/catalog"
- elementFormDefault="qualified">
-
- <xsd:element name="catalog">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="chain" type="netui:chain" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="command" type="netui:command" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string"/>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="chain">
- <xsd:sequence>
- <xsd:element name="command" type="netui:command" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string"/>
- </xsd:complexType>
-
- <xsd:complexType name="command">
- <xsd:sequence>
- <xsd:element name="id" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="command-class" type="xsd:string" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="custom-property" type="netui:custom-property" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="custom-property">
- <xsd:sequence>
- <xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="value" type="xsd:string" minOccurs="1" maxOccurs="1"/>
- </xsd:sequence>
- </xsd:complexType>
-
-</xsd:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+
+ $Header:$
+-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://beehive.apache.org/netui/2006/server/catalog"
+ xmlns:netui="http://beehive.apache.org/netui/2006/server/catalog"
+ elementFormDefault="qualified">
+
+ <xsd:element name="catalog">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="chain" type="netui:chain" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="command" type="netui:command" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:complexType name="chain">
+ <xsd:sequence>
+ <xsd:element name="command" type="netui:command" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="command">
+ <xsd:sequence>
+ <xsd:element name="id" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="command-class" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="custom-property" type="netui:custom-property" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="custom-property">
+ <xsd:sequence>
+ <xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="value" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+</xsd:schema>
Propchange: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/catalog/catalog-config.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/internal/Log4JLogger.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/internal/Log4JLogger.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/internal/Log4JLogger.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/internal/Log4JLogger.java Wed May 10 08:49:42 2006
@@ -1,158 +1,158 @@
-/*
- * Copyright 2004 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.
- *
- * $Header:$
- */
-package org.apache.beehive.netui.util.logging.internal;
-
-import java.io.StringWriter;
-import java.io.PrintWriter;
-
-import org.apache.commons.logging.Log;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Category;
-
-/**
- * <p>
- * Logging abstraction used to pipe log messages to Log4J. This class is used for
- * NetUI backwards compatability so that previous {@link org.apache.beehive.netui.util.logging.Logger}
- * clients continue to log through the usual Log4J channels.
- * </p>
- *
- * @deprecated
- */
-public final class Log4JLogger
- implements Log {
-
- private static final String STRUTS_APPENDER = "commons-logging";
-
- static {
- // Need to get rid of the appender that Struts adds so
- // that we don't spam the console with all messages
- Category root = Category.getRoot();
-
- if (root.getAppender(STRUTS_APPENDER) != null)
- root.removeAppender(STRUTS_APPENDER);
- }
-
- private Logger _logInstance;
-
- public static Log getInstance(Class clazz) {
- return new Log4JLogger(clazz);
- }
-
- private Log4JLogger(Class clazz) {
- this(clazz.getName());
- }
-
- private Log4JLogger(String className) {
- _logInstance = Logger.getLogger(className);
- }
-
- public boolean isDebugEnabled() {
- return _logInstance.isEnabledFor(Level.DEBUG);
- }
-
- public boolean isErrorEnabled() {
- return _logInstance.isEnabledFor(Level.ERROR);
- }
-
- public boolean isFatalEnabled() {
- return _logInstance.isEnabledFor(Level.FATAL);
- }
-
- public boolean isInfoEnabled() {
- return _logInstance.isEnabledFor(Level.INFO);
- }
-
- public boolean isTraceEnabled() {
- return _logInstance.isEnabledFor(Level.DEBUG);
- }
-
- public boolean isWarnEnabled() {
- return _logInstance.isEnabledFor(Level.WARN);
- }
-
- public void debug(Object message) {
- if (_logInstance.isEnabledFor(Level.DEBUG))
- _logInstance.debug(message);
- }
-
- public void debug(Object message, Throwable t) {
- if (_logInstance.isEnabledFor(Level.DEBUG))
- _logInstance.debug(format(message, t));
- }
-
- public void trace(Object message) {
- if (_logInstance.isEnabledFor(Level.DEBUG))
- _logInstance.debug(message);
- }
-
- public void trace(Object message, Throwable t) {
- if (_logInstance.isEnabledFor(Level.DEBUG))
- _logInstance.debug(format(message, t));
- }
-
- public void info(Object message) {
- if (_logInstance.isEnabledFor(Level.INFO))
- _logInstance.info(message);
- }
-
- public void info(Object message, Throwable t) {
- if (_logInstance.isEnabledFor(Level.INFO))
- _logInstance.info(format(message, t));
- }
-
- public void warn(Object message) {
- if (_logInstance.isEnabledFor(Level.WARN))
- _logInstance.warn(message);
- }
-
- public void warn(Object message, Throwable t) {
- if (_logInstance.isEnabledFor(Level.WARN))
- _logInstance.warn(format(message, t));
- }
-
- public void error(Object message) {
- if (_logInstance.isEnabledFor(Level.ERROR))
- _logInstance.error(message);
- }
-
- public void error(Object message, Throwable t) {
- if (_logInstance.isEnabledFor(Level.ERROR))
- _logInstance.error(format(message, t));
- }
-
- public void fatal(Object message) {
- if (_logInstance.isEnabledFor(Level.FATAL))
- _logInstance.fatal(message);
- }
-
- public void fatal(Object message, Throwable t) {
- if (_logInstance.isEnabledFor(Level.FATAL))
- _logInstance.fatal(format(message, t));
- }
-
- private String format(Object m, Throwable t) {
- if(t == null)
- return m.toString();
-
- StringWriter sw = new StringWriter();
- t.printStackTrace(new PrintWriter(sw));
-
- return m + "\n\n" + "Throwable: " + t.toString() + "\nStack Trace:\n" + sw.toString();
- }
-}
+/*
+ * Copyright 2004 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.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.util.logging.internal;
+
+import java.io.StringWriter;
+import java.io.PrintWriter;
+
+import org.apache.commons.logging.Log;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Category;
+
+/**
+ * <p>
+ * Logging abstraction used to pipe log messages to Log4J. This class is used for
+ * NetUI backwards compatability so that previous {@link org.apache.beehive.netui.util.logging.Logger}
+ * clients continue to log through the usual Log4J channels.
+ * </p>
+ *
+ * @deprecated
+ */
+public final class Log4JLogger
+ implements Log {
+
+ private static final String STRUTS_APPENDER = "commons-logging";
+
+ static {
+ // Need to get rid of the appender that Struts adds so
+ // that we don't spam the console with all messages
+ Category root = Category.getRoot();
+
+ if (root.getAppender(STRUTS_APPENDER) != null)
+ root.removeAppender(STRUTS_APPENDER);
+ }
+
+ private Logger _logInstance;
+
+ public static Log getInstance(Class clazz) {
+ return new Log4JLogger(clazz);
+ }
+
+ private Log4JLogger(Class clazz) {
+ this(clazz.getName());
+ }
+
+ private Log4JLogger(String className) {
+ _logInstance = Logger.getLogger(className);
+ }
+
+ public boolean isDebugEnabled() {
+ return _logInstance.isEnabledFor(Level.DEBUG);
+ }
+
+ public boolean isErrorEnabled() {
+ return _logInstance.isEnabledFor(Level.ERROR);
+ }
+
+ public boolean isFatalEnabled() {
+ return _logInstance.isEnabledFor(Level.FATAL);
+ }
+
+ public boolean isInfoEnabled() {
+ return _logInstance.isEnabledFor(Level.INFO);
+ }
+
+ public boolean isTraceEnabled() {
+ return _logInstance.isEnabledFor(Level.DEBUG);
+ }
+
+ public boolean isWarnEnabled() {
+ return _logInstance.isEnabledFor(Level.WARN);
+ }
+
+ public void debug(Object message) {
+ if (_logInstance.isEnabledFor(Level.DEBUG))
+ _logInstance.debug(message);
+ }
+
+ public void debug(Object message, Throwable t) {
+ if (_logInstance.isEnabledFor(Level.DEBUG))
+ _logInstance.debug(format(message, t));
+ }
+
+ public void trace(Object message) {
+ if (_logInstance.isEnabledFor(Level.DEBUG))
+ _logInstance.debug(message);
+ }
+
+ public void trace(Object message, Throwable t) {
+ if (_logInstance.isEnabledFor(Level.DEBUG))
+ _logInstance.debug(format(message, t));
+ }
+
+ public void info(Object message) {
+ if (_logInstance.isEnabledFor(Level.INFO))
+ _logInstance.info(message);
+ }
+
+ public void info(Object message, Throwable t) {
+ if (_logInstance.isEnabledFor(Level.INFO))
+ _logInstance.info(format(message, t));
+ }
+
+ public void warn(Object message) {
+ if (_logInstance.isEnabledFor(Level.WARN))
+ _logInstance.warn(message);
+ }
+
+ public void warn(Object message, Throwable t) {
+ if (_logInstance.isEnabledFor(Level.WARN))
+ _logInstance.warn(format(message, t));
+ }
+
+ public void error(Object message) {
+ if (_logInstance.isEnabledFor(Level.ERROR))
+ _logInstance.error(message);
+ }
+
+ public void error(Object message, Throwable t) {
+ if (_logInstance.isEnabledFor(Level.ERROR))
+ _logInstance.error(format(message, t));
+ }
+
+ public void fatal(Object message) {
+ if (_logInstance.isEnabledFor(Level.FATAL))
+ _logInstance.fatal(message);
+ }
+
+ public void fatal(Object message, Throwable t) {
+ if (_logInstance.isEnabledFor(Level.FATAL))
+ _logInstance.fatal(format(message, t));
+ }
+
+ private String format(Object m, Throwable t) {
+ if(t == null)
+ return m.toString();
+
+ StringWriter sw = new StringWriter();
+ t.printStackTrace(new PrintWriter(sw));
+
+ return m + "\n\n" + "Throwable: " + t.toString() + "\nStack Trace:\n" + sw.toString();
+ }
+}
Propchange: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/internal/Log4JLogger.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/test/conf/testRecorder-server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/GA_DeprecationWarning/expectedOutput/struts-config--global.expected
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/GA_DeprecationWarning/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/GA_DeprecationWarning/expectedOutput/warningsorerrors.expected?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/GA_DeprecationWarning/expectedOutput/warningsorerrors.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/GA_DeprecationWarning/expectedOutput/warningsorerrors.expected Wed May 10 08:49:42 2006
@@ -1,4 +1,4 @@
-Note: [LOCAL_PATH]\WEB-INF\.tmpbeansrc\WEB-INF\src\global\Global.java uses or overrides a deprecated API.
-Note: Recompile with -Xlint:deprecation for details.
-Note: [LOCAL_PATH]\WEB-INF\.tmpbeansrc\WEB-INF\src\global\Global.java uses or overrides a deprecated API.
-Note: Recompile with -Xlint:deprecation for details.
+Note: [LOCAL_PATH]\WEB-INF\.tmpbeansrc\WEB-INF\src\global\Global.java uses or overrides a deprecated API.
+Note: Recompile with -Xlint:deprecation for details.
+Note: [LOCAL_PATH]\WEB-INF\.tmpbeansrc\WEB-INF\src\global\Global.java uses or overrides a deprecated API.
+Note: Recompile with -Xlint:deprecation for details.
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/GA_DeprecationWarning/expectedOutput/warningsorerrors.expected
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/GA_WrongLocation/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/GA_WrongLocation/expectedOutput/warningsorerrors.expected?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/GA_WrongLocation/expectedOutput/warningsorerrors.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/GA_WrongLocation/expectedOutput/warningsorerrors.expected Wed May 10 08:49:42 2006
@@ -1,13 +1,13 @@
-[LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongLocation\Global.java:34: warning: File "Page1.jsp" could not be found in the web application.
- protected Forward page1()
- ^
-[LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongLocation\Global.java:49: warning: File "Page2.jsp" could not be found in the web application.
- protected Forward page2()
- ^
-[LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongLocation\Global.java:22: Global.app must be in the /WEB-INF/src/global directory.
-public class Global extends GlobalApp
- ^
-Note: [LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongLocation\Global.java uses or overrides a deprecated API.
-Note: Recompile with -Xlint:deprecation for details.
-1 error
-2 warnings
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongLocation\Global.java:34: warning: File "Page1.jsp" could not be found in the web application.
+ protected Forward page1()
+ ^
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongLocation\Global.java:49: warning: File "Page2.jsp" could not be found in the web application.
+ protected Forward page2()
+ ^
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongLocation\Global.java:22: Global.app must be in the /WEB-INF/src/global directory.
+public class Global extends GlobalApp
+ ^
+Note: [LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongLocation\Global.java uses or overrides a deprecated API.
+Note: Recompile with -Xlint:deprecation for details.
+1 error
+2 warnings
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/GA_WrongLocation/expectedOutput/warningsorerrors.expected
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/GA_WrongPkg/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/GA_WrongPkg/expectedOutput/warningsorerrors.expected?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/GA_WrongPkg/expectedOutput/warningsorerrors.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/GA_WrongPkg/expectedOutput/warningsorerrors.expected Wed May 10 08:49:42 2006
@@ -1,16 +1,16 @@
-[LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongPkg\Global.java:30: warning: File "Page1.jsp" could not be found in the web application.
- protected Forward begin()
- ^
-[LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongPkg\Global.java:45: warning: File "Page2.jsp" could not be found in the web application.
- protected Forward page2()
- ^
-[LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongPkg\Global.java:18: The package must be "global".
-public class Global extends GlobalApp
- ^
-[LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongPkg\Global.java:18: Global.app must be in the /WEB-INF/src/global directory.
-public class Global extends GlobalApp
- ^
-Note: [LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongPkg\Global.java uses or overrides a deprecated API.
-Note: Recompile with -Xlint:deprecation for details.
-2 errors
-2 warnings
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongPkg\Global.java:30: warning: File "Page1.jsp" could not be found in the web application.
+ protected Forward begin()
+ ^
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongPkg\Global.java:45: warning: File "Page2.jsp" could not be found in the web application.
+ protected Forward page2()
+ ^
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongPkg\Global.java:18: The package must be "global".
+public class Global extends GlobalApp
+ ^
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongPkg\Global.java:18: Global.app must be in the /WEB-INF/src/global directory.
+public class Global extends GlobalApp
+ ^
+Note: [LOCAL_PATH]\WEB-INF\.tmpbeansrc\GA_WrongPkg\Global.java uses or overrides a deprecated API.
+Note: Recompile with -Xlint:deprecation for details.
+2 errors
+2 warnings
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/GA_WrongPkg/expectedOutput/warningsorerrors.expected
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1090/expectedOutput/struts-config-Jira1090-subdir.expected
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira1090/expectedOutput/struts-config-Jira1090.expected
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira389/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira389/expectedOutput/warningsorerrors.expected?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Jira389/expectedOutput/warningsorerrors.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Jira389/expectedOutput/warningsorerrors.expected Wed May 10 08:49:42 2006
@@ -1,4 +1,4 @@
-[LOCAL_PATH]\WEB-INF\.tmpbeansrc\Jira389\Controller.java:20: Attribute "bundlePath" must be present.
-public class Controller extends PageFlowController
- ^
-1 error
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\Jira389\Controller.java:20: Attribute "bundlePath" must be present.
+public class Controller extends PageFlowController
+ ^
+1 error
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira389/expectedOutput/warningsorerrors.expected
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira390/expectedOutput/struts-config-Jira390.expected
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/expectedOutput/struts-config-Jira611-child.expected
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/expectedOutput/struts-config-Jira611-parent.expected
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_Abstract/expectedOutput/struts-config-Nested_Abstract.expected
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/struts-config-Nested_NewReturnTo.expected
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/warningsorerrors.expected?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/warningsorerrors.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/warningsorerrors.expected Wed May 10 08:49:42 2006
@@ -1,4 +1,4 @@
-[LOCAL_PATH]\WEB-INF\.tmpbeansrc\Nested_NewReturnTo\Controller.java:104: warning: The "page" value is deprecated.
- protected Forward action5()
- ^
-1 warning
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\Nested_NewReturnTo\Controller.java:104: warning: The "page" value is deprecated.
+ protected Forward action5()
+ ^
+1 warning
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/warningsorerrors.expected
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/expectedOutput/struts-config-PF_ActionMethodOverload.expected
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/expectedOutput/warningsorerrors.expected?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/expectedOutput/warningsorerrors.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/expectedOutput/warningsorerrors.expected Wed May 10 08:49:42 2006
@@ -1,4 +1,4 @@
-[LOCAL_PATH]\WEB-INF\.tmpbeansrc\PF_ActionMethodWithNonformArg\Controller.java:36: Type int is not valid as the form bean for an action.
- protected Forward page1(int inForm)
- ^
-1 error
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\PF_ActionMethodWithNonformArg\Controller.java:36: Type int is not valid as the form bean for an action.
+ protected Forward page1(int inForm)
+ ^
+1 error