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 [2/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/external/struts/LICENSE
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/external/struts/LICENSE?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/external/struts/LICENSE (original)
+++ beehive/trunk/netui/external/struts/LICENSE Wed May 10 08:49:42 2006
@@ -1,174 +1,174 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
Propchange: beehive/trunk/netui/external/struts/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/external/struts/NOTICE
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/external/struts/NOTICE?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/external/struts/NOTICE (original)
+++ beehive/trunk/netui/external/struts/NOTICE Wed May 10 08:49:42 2006
@@ -1,7 +1,7 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes the ANTLR parsing library,
-developed by JGuru.com (http://www.antlr.org and
-http://www.jguru.com).
-
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes the ANTLR parsing library,
+developed by JGuru.com (http://www.antlr.org and
+http://www.jguru.com).
+
Propchange: beehive/trunk/netui/external/struts/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/external/struts/legacy/jakarta-struts-1.1-lib/LICENSE
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/external/struts/legacy/jakarta-struts-1.1-lib/LICENSE?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/external/struts/legacy/jakarta-struts-1.1-lib/LICENSE (original)
+++ beehive/trunk/netui/external/struts/legacy/jakarta-struts-1.1-lib/LICENSE Wed May 10 08:49:42 2006
@@ -1,65 +1,65 @@
-/*
- * $Header: /home/cvs/jakarta-struts/LICENSE,v 1.2 2001/02/02 00:38:31 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2001/02/02 00:38:31 $
- *
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Struts", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-
-
-
-
+/*
+ * $Header: /home/cvs/jakarta-struts/LICENSE,v 1.2 2001/02/02 00:38:31 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/02/02 00:38:31 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+
+
+
+
Propchange: beehive/trunk/netui/external/struts/legacy/jakarta-struts-1.1-lib/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tld/xdoclet/tld.xdt
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tld/xdoclet/tld.xdt?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tld/xdoclet/tld.xdt (original)
+++ beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tld/xdoclet/tld.xdt Wed May 10 08:49:42 2006
@@ -1,94 +1,94 @@
-<?xml version="1.0" encoding="<XDtConfig:configParameterValue paramName='Xmlencoding'/>"?>
-<taglib version="2.0" xmlns="http://java.sun.com/xml/ns/j2ee">
- <XDtConfig:ifConfigParamNotEquals paramName="Description" value="">
- <description><![CDATA[<XDtConfig:configParameterValue paramName="Description"/>]]></description>
- </XDtConfig:ifConfigParamNotEquals>
- <tlib-version><XDtConfig:configParameterValue paramName="Taglibversion"/></tlib-version>
- <short-name><XDtConfig:configParameterValue paramName="Shortname"/></short-name>
- <XDtConfig:ifConfigParamNotEquals paramName="Uri" value="">
- <uri><XDtConfig:configParameterValue paramName="Uri"/></uri>
- </XDtConfig:ifConfigParamNotEquals>
-
- <XDtClass:forAllClasses type="javax.servlet.jsp.tagext.TagLibraryValidator" abstract="false">
- <validator>
- <validator-class><XDtClass:fullClassName/></validator-class>
- <XDtClass:forAllClassTags tagName="netui:validator-init-param">
- <init-param>
- <param-name><XDtClass:classTagValue tagName="netui:validator-init-param" paramName="name"/></param-name>
- <param-value><XDtClass:classTagValue tagName="netui:validator-init-param" paramName="value"/></param-value>
- <XDtClass:ifHasClassTag tagName="netui:validator-init-param" paramName="description">
- <description><![CDATA[<XDtClass:classTagValue tagName="netui:validator-init-param" paramName="description"/>]]></description>
- </XDtClass:ifHasClassTag>
- </init-param>
- </XDtClass:forAllClassTags>
- <description><![CDATA[<XDtClass:firstSentenceDescription/>]]></description>
- </validator>
- </XDtClass:forAllClasses>
-
- <XDtClass:forAllClasses type="javax.servlet.http.HttpSessionActivationListener,javax.servlet.http.HttpSessionAttributeListener,javax.servlet.http.HttpSessionBindingListener,javax.servlet.http.HttpSessionListener,javax.servlet.ServletContextAttributeListener,javax.servlet.ServletContextListener" abstract="false">
- <listener>
- <listener-class><XDtClass:fullClassName/></listener-class>
- </listener>
- </XDtClass:forAllClasses>
-
- <XDtNetUITldGen:forAllClasses
- type="javax.servlet.jsp.tagext.Tag,javax.servlet.jsp.tagext.JspTag,javax.servlet.jsp.tagext.SimpleTag,javax.servlet.jsp.tagext.TagSupport,javax.servlet.jsp.tagext.SimpleTagSupport,javax.servlet.jsp.tagext.BodyTagSupport,org.apache.beehive.netui.tags.AbstractBaseTag,org.apache.beehive.netui.tags.AbstractSimpleTag,org.apache.beehive.netui.tags.DataSourceTag,org.apache.beehive.netui.tags.databinding.base.StructuredBaseTag,org.apache.beehive.netui.tags.html.HtmlBaseTag"
- abstract="false"
- extent="hierarchy">
- <XDtClass:ifHasClassTag tagName="netui:tag">
- <tag>
-
- <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion" value="1.2">
- <XDtClass:ifHasClassTag tagName="netui:tag" paramName="description">
- <description><![CDATA[<XDtClass:classTagValue tagName="netui:tag" paramName="description"/>]]></description>
- </XDtClass:ifHasClassTag>
- <name><XDtClass:classTagValue tagName="netui:tag" paramName="name"/></name>
- <tag-class><XDtClass:fullClassName/></tag-class>
- <XDtClass:ifHasClassTag tagName="netui:tag" paramName="tei-class">
- <tei-class><XDtClass:classTagValue tagName="netui:tag" paramName="tei-class"/></tei-class>
- </XDtClass:ifHasClassTag>
- <XDtClass:ifHasClassTag tagName="netui:tag" paramName="body-content" values="JSP,empty,scriptless,tagdependent">
- <body-content><XDtClass:classTagValue tagName="netui:tag" paramName="body-content"/></body-content>
- </XDtClass:ifHasClassTag>
- <XDtClass:ifHasClassTag tagName="netui:tag" paramName="dynamic-attributes" values="true">
- <dynamic-attributes><XDtClass:classTagValue tagName="netui:tag" paramName="dynamic-attributes"/></dynamic-attributes>
- </XDtClass:ifHasClassTag>
- </XDtConfig:ifConfigParamGreaterOrEquals>
-
- <XDtNetUITldGen:forAllAttributes tagName="netui:attribute">
- <attribute>
- <XDtNetUITldGen:ifHasTagValue paramName="description">
- <description><![CDATA[<XDtNetUITldGen:paramValue paramName="description"/>]]></description>
- </XDtNetUITldGen:ifHasTagValue>
- <name><XDtMethod:propertyName/></name>
- <XDtNetUITldGen:ifHasTagValue paramName="required">
- <required><XDtNetUITldGen:paramValue paramName="required" values="true,false,yes,no"/></required>
- </XDtNetUITldGen:ifHasTagValue>
- <XDtNetUITldGen:ifHasTagValue paramName="rtexprvalue">
- <rtexprvalue><XDtNetUITldGen:paramValue paramName="rtexprvalue" values="true,false,yes,no"/></rtexprvalue>
- </XDtNetUITldGen:ifHasTagValue>
- <XDtNetUITldGen:ifHasTagValue paramName="type">
- <type><XDtNetUITldGen:paramValue paramName="type"/></type>
- </XDtNetUITldGen:ifHasTagValue>
- <XDtNetUITldGen:ifHasTagValue paramName="fragment">
- <fragment><XDtNetUITldGen:paramValue paramName="fragment" values="true,false,yes,no"/></fragment>
- </XDtNetUITldGen:ifHasTagValue>
- </attribute>
-</XDtNetUITldGen:forAllAttributes>
- </tag>
- </XDtClass:ifHasClassTag>
- </XDtNetUITldGen:forAllClasses>
-
- <XDtNetUITldGen:forAllFunctions type="java.lang.Object" abstract="false" extent="hierarchy">
- <XDtClass:ifHasClassTag tagName="netui:jspfunctions">
- <XDtNetUITldGen:forAllMethods tagName="netui:jspfunction">
- <function>
- <name><XDtNetUITldGen:paramValue paramName="name"/></name>
- <function-class><XDtClass:fullClassName/></function-class>
- <function-signature><XDtNetUITldGen:paramValue paramName="signature"/></function-signature>
- </function>
- </XDtNetUITldGen:forAllMethods>
- </XDtClass:ifHasClassTag>
- </XDtNetUITldGen:forAllFunctions>
-</taglib>
-
+<?xml version="1.0" encoding="<XDtConfig:configParameterValue paramName='Xmlencoding'/>"?>
+<taglib version="2.0" xmlns="http://java.sun.com/xml/ns/j2ee">
+ <XDtConfig:ifConfigParamNotEquals paramName="Description" value="">
+ <description><![CDATA[<XDtConfig:configParameterValue paramName="Description"/>]]></description>
+ </XDtConfig:ifConfigParamNotEquals>
+ <tlib-version><XDtConfig:configParameterValue paramName="Taglibversion"/></tlib-version>
+ <short-name><XDtConfig:configParameterValue paramName="Shortname"/></short-name>
+ <XDtConfig:ifConfigParamNotEquals paramName="Uri" value="">
+ <uri><XDtConfig:configParameterValue paramName="Uri"/></uri>
+ </XDtConfig:ifConfigParamNotEquals>
+
+ <XDtClass:forAllClasses type="javax.servlet.jsp.tagext.TagLibraryValidator" abstract="false">
+ <validator>
+ <validator-class><XDtClass:fullClassName/></validator-class>
+ <XDtClass:forAllClassTags tagName="netui:validator-init-param">
+ <init-param>
+ <param-name><XDtClass:classTagValue tagName="netui:validator-init-param" paramName="name"/></param-name>
+ <param-value><XDtClass:classTagValue tagName="netui:validator-init-param" paramName="value"/></param-value>
+ <XDtClass:ifHasClassTag tagName="netui:validator-init-param" paramName="description">
+ <description><![CDATA[<XDtClass:classTagValue tagName="netui:validator-init-param" paramName="description"/>]]></description>
+ </XDtClass:ifHasClassTag>
+ </init-param>
+ </XDtClass:forAllClassTags>
+ <description><![CDATA[<XDtClass:firstSentenceDescription/>]]></description>
+ </validator>
+ </XDtClass:forAllClasses>
+
+ <XDtClass:forAllClasses type="javax.servlet.http.HttpSessionActivationListener,javax.servlet.http.HttpSessionAttributeListener,javax.servlet.http.HttpSessionBindingListener,javax.servlet.http.HttpSessionListener,javax.servlet.ServletContextAttributeListener,javax.servlet.ServletContextListener" abstract="false">
+ <listener>
+ <listener-class><XDtClass:fullClassName/></listener-class>
+ </listener>
+ </XDtClass:forAllClasses>
+
+ <XDtNetUITldGen:forAllClasses
+ type="javax.servlet.jsp.tagext.Tag,javax.servlet.jsp.tagext.JspTag,javax.servlet.jsp.tagext.SimpleTag,javax.servlet.jsp.tagext.TagSupport,javax.servlet.jsp.tagext.SimpleTagSupport,javax.servlet.jsp.tagext.BodyTagSupport,org.apache.beehive.netui.tags.AbstractBaseTag,org.apache.beehive.netui.tags.AbstractSimpleTag,org.apache.beehive.netui.tags.DataSourceTag,org.apache.beehive.netui.tags.databinding.base.StructuredBaseTag,org.apache.beehive.netui.tags.html.HtmlBaseTag"
+ abstract="false"
+ extent="hierarchy">
+ <XDtClass:ifHasClassTag tagName="netui:tag">
+ <tag>
+
+ <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion" value="1.2">
+ <XDtClass:ifHasClassTag tagName="netui:tag" paramName="description">
+ <description><![CDATA[<XDtClass:classTagValue tagName="netui:tag" paramName="description"/>]]></description>
+ </XDtClass:ifHasClassTag>
+ <name><XDtClass:classTagValue tagName="netui:tag" paramName="name"/></name>
+ <tag-class><XDtClass:fullClassName/></tag-class>
+ <XDtClass:ifHasClassTag tagName="netui:tag" paramName="tei-class">
+ <tei-class><XDtClass:classTagValue tagName="netui:tag" paramName="tei-class"/></tei-class>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag tagName="netui:tag" paramName="body-content" values="JSP,empty,scriptless,tagdependent">
+ <body-content><XDtClass:classTagValue tagName="netui:tag" paramName="body-content"/></body-content>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag tagName="netui:tag" paramName="dynamic-attributes" values="true">
+ <dynamic-attributes><XDtClass:classTagValue tagName="netui:tag" paramName="dynamic-attributes"/></dynamic-attributes>
+ </XDtClass:ifHasClassTag>
+ </XDtConfig:ifConfigParamGreaterOrEquals>
+
+ <XDtNetUITldGen:forAllAttributes tagName="netui:attribute">
+ <attribute>
+ <XDtNetUITldGen:ifHasTagValue paramName="description">
+ <description><![CDATA[<XDtNetUITldGen:paramValue paramName="description"/>]]></description>
+ </XDtNetUITldGen:ifHasTagValue>
+ <name><XDtMethod:propertyName/></name>
+ <XDtNetUITldGen:ifHasTagValue paramName="required">
+ <required><XDtNetUITldGen:paramValue paramName="required" values="true,false,yes,no"/></required>
+ </XDtNetUITldGen:ifHasTagValue>
+ <XDtNetUITldGen:ifHasTagValue paramName="rtexprvalue">
+ <rtexprvalue><XDtNetUITldGen:paramValue paramName="rtexprvalue" values="true,false,yes,no"/></rtexprvalue>
+ </XDtNetUITldGen:ifHasTagValue>
+ <XDtNetUITldGen:ifHasTagValue paramName="type">
+ <type><XDtNetUITldGen:paramValue paramName="type"/></type>
+ </XDtNetUITldGen:ifHasTagValue>
+ <XDtNetUITldGen:ifHasTagValue paramName="fragment">
+ <fragment><XDtNetUITldGen:paramValue paramName="fragment" values="true,false,yes,no"/></fragment>
+ </XDtNetUITldGen:ifHasTagValue>
+ </attribute>
+</XDtNetUITldGen:forAllAttributes>
+ </tag>
+ </XDtClass:ifHasClassTag>
+ </XDtNetUITldGen:forAllClasses>
+
+ <XDtNetUITldGen:forAllFunctions type="java.lang.Object" abstract="false" extent="hierarchy">
+ <XDtClass:ifHasClassTag tagName="netui:jspfunctions">
+ <XDtNetUITldGen:forAllMethods tagName="netui:jspfunction">
+ <function>
+ <name><XDtNetUITldGen:paramValue paramName="name"/></name>
+ <function-class><XDtClass:fullClassName/></function-class>
+ <function-signature><XDtNetUITldGen:paramValue paramName="signature"/></function-signature>
+ </function>
+ </XDtNetUITldGen:forAllMethods>
+ </XDtClass:ifHasClassTag>
+ </XDtNetUITldGen:forAllFunctions>
+</taglib>
+
Propchange: beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tld/xdoclet/tld.xdt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/bootstrap/xdoclet-xml.xdt
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/bootstrap/xdoclet-xml.xdt?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/bootstrap/xdoclet-xml.xdt (original)
+++ beehive/trunk/netui/src/bootstrap/xdoclet-xml.xdt Wed May 10 08:49:42 2006
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-<!DOCTYPE xdoclet-module PUBLIC "-//XDoclet Team//DTD XDoclet Module 1.0//EN" "http://xdoclet.sourceforge.net/dtd/xdoclet-module_1_0.dtd">
--->
-
-<XDtComment:comment>
-This template builds the deployment descriptor for modules
-</XDtComment:comment>
-
-<xdoclet-module>
- <!--
- <XDtClass:forAllClasses>
- <XDtClass:fullClassName/>
- </XDtClass:forAllClasses>
- -->
-
- <XDtClass:forAllClasses type="xdoclet.template.TemplateTagHandler" abstract="false">
- <taghandler
- namespace="<XDtClass:classTagValue tagName="xdoclet.taghandler" paramName="namespace" mandatory="true"/>"
- class="<XDtClass:fullClassName/>"
- />
- </XDtClass:forAllClasses>
-
- <XDtClass:forAllClasses type="xdoclet.SubTask" abstract="false">
- <subtask
- name="<XDtClass:classTagValue tagName="ant.element" paramName="name" mandatory="true"/>"
- implementation-class="<XDtClass:fullClassName/>"
- parent-task-class="<XDtClass:classTagValue tagName="ant.element" paramName="parent" mandatory="true"/>"
- />
- </XDtClass:forAllClasses>
-</xdoclet-module>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+<!DOCTYPE xdoclet-module PUBLIC "-//XDoclet Team//DTD XDoclet Module 1.0//EN" "http://xdoclet.sourceforge.net/dtd/xdoclet-module_1_0.dtd">
+-->
+
+<XDtComment:comment>
+This template builds the deployment descriptor for modules
+</XDtComment:comment>
+
+<xdoclet-module>
+ <!--
+ <XDtClass:forAllClasses>
+ <XDtClass:fullClassName/>
+ </XDtClass:forAllClasses>
+ -->
+
+ <XDtClass:forAllClasses type="xdoclet.template.TemplateTagHandler" abstract="false">
+ <taghandler
+ namespace="<XDtClass:classTagValue tagName="xdoclet.taghandler" paramName="namespace" mandatory="true"/>"
+ class="<XDtClass:fullClassName/>"
+ />
+ </XDtClass:forAllClasses>
+
+ <XDtClass:forAllClasses type="xdoclet.SubTask" abstract="false">
+ <subtask
+ name="<XDtClass:classTagValue tagName="ant.element" paramName="name" mandatory="true"/>"
+ implementation-class="<XDtClass:fullClassName/>"
+ parent-task-class="<XDtClass:classTagValue tagName="ant.element" paramName="parent" mandatory="true"/>"
+ />
+ </XDtClass:forAllClasses>
+</xdoclet-module>
Propchange: beehive/trunk/netui/src/bootstrap/xdoclet-xml.xdt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/compiler-apt/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-apt/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-apt/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory (original)
+++ beehive/trunk/netui/src/compiler-apt/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory Wed May 10 08:49:42 2006
@@ -1 +1 @@
-org.apache.beehive.netui.compiler.apt.PageFlowAnnotationProcessorFactory
+org.apache.beehive.netui.compiler.apt.PageFlowAnnotationProcessorFactory
Propchange: beehive/trunk/netui/src/compiler-apt/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/src/compiler-apt/beehive-netui-compiler.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/netui/src/compiler-apt/org/apache/beehive/netui/compiler/typesystem/impl/type/ErrorTypeImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/AbsolutePathType.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/AbsolutePathType.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/AbsolutePathType.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/AbsolutePathType.java Wed May 10 08:49:42 2006
@@ -1,45 +1,45 @@
-/**
- * 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.compiler.grammar;
-
-import org.apache.beehive.netui.compiler.AnnotationGrammar;
-import org.apache.beehive.netui.compiler.AnnotationMemberType;
-import org.apache.beehive.netui.compiler.CompilerUtils;
-import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
-import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration;
-import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue;
-import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration;
-
-public class AbsolutePathType extends AnnotationMemberType {
-
- public AbsolutePathType( String requiredRuntimeVersion, AnnotationGrammar parentGrammar )
- {
- super( requiredRuntimeVersion, parentGrammar);
- }
-
-
- public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue member,
- AnnotationInstance[] parentAnnotations, MemberDeclaration classMember,
- int annotationArrayIndex )
- {
- AnnotationInstance parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ];
- String path = CompilerUtils.getString( parentAnnotation, PATH_ATTR, false );
- if ( ! path.startsWith("/") ) addError( member, "error.absolute-path-required-for-external-redirect", null );
- return null;
- }
-}
+/**
+ * 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.compiler.grammar;
+
+import org.apache.beehive.netui.compiler.AnnotationGrammar;
+import org.apache.beehive.netui.compiler.AnnotationMemberType;
+import org.apache.beehive.netui.compiler.CompilerUtils;
+import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
+import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration;
+import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue;
+import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration;
+
+public class AbsolutePathType extends AnnotationMemberType {
+
+ public AbsolutePathType( String requiredRuntimeVersion, AnnotationGrammar parentGrammar )
+ {
+ super( requiredRuntimeVersion, parentGrammar);
+ }
+
+
+ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue member,
+ AnnotationInstance[] parentAnnotations, MemberDeclaration classMember,
+ int annotationArrayIndex )
+ {
+ AnnotationInstance parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ];
+ String path = CompilerUtils.getString( parentAnnotation, PATH_ATTR, false );
+ if ( ! path.startsWith("/") ) addError( member, "error.absolute-path-required-for-external-redirect", null );
+ return null;
+ }
+}
Propchange: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/AbsolutePathType.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExternalPathOrActionType.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExternalPathOrActionType.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExternalPathOrActionType.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExternalPathOrActionType.java Wed May 10 08:49:42 2006
@@ -1,53 +1,53 @@
-/*
- * 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.compiler.grammar;
-
-import org.apache.beehive.netui.compiler.AnnotationGrammar;
-import org.apache.beehive.netui.compiler.FlowControllerInfo;
-import org.apache.beehive.netui.compiler.CompilerUtils;
-import org.apache.beehive.netui.compiler.FatalCompileTimeException;
-import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration;
-import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue;
-import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
-import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration;
-
-public class ExternalPathOrActionType extends WebappPathOrActionType
-{
- public ExternalPathOrActionType( boolean pathMustBeRelative, String requiredRuntimeVersion,
- AnnotationGrammar parentGrammar, FlowControllerInfo fcInfo )
- {
- super( pathMustBeRelative, requiredRuntimeVersion, parentGrammar, fcInfo );
- }
-
-
- public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value,
- AnnotationInstance[] parentAnnotations, MemberDeclaration classMember,
- int annotationArrayIndex )
- throws FatalCompileTimeException
- {
- AnnotationInstance parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ];
-
- // if we have an external redirect just bail
- if ( CompilerUtils.getBoolean( parentAnnotation, EXTERNAL_REDIRECT_ATTR, false ).booleanValue() )
- {
- return null;
- }
-
- return super.onCheck( valueDecl, value, parentAnnotations, classMember, annotationArrayIndex );
- }
-}
+/*
+ * 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.compiler.grammar;
+
+import org.apache.beehive.netui.compiler.AnnotationGrammar;
+import org.apache.beehive.netui.compiler.FlowControllerInfo;
+import org.apache.beehive.netui.compiler.CompilerUtils;
+import org.apache.beehive.netui.compiler.FatalCompileTimeException;
+import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration;
+import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue;
+import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
+import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration;
+
+public class ExternalPathOrActionType extends WebappPathOrActionType
+{
+ public ExternalPathOrActionType( boolean pathMustBeRelative, String requiredRuntimeVersion,
+ AnnotationGrammar parentGrammar, FlowControllerInfo fcInfo )
+ {
+ super( pathMustBeRelative, requiredRuntimeVersion, parentGrammar, fcInfo );
+ }
+
+
+ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value,
+ AnnotationInstance[] parentAnnotations, MemberDeclaration classMember,
+ int annotationArrayIndex )
+ throws FatalCompileTimeException
+ {
+ AnnotationInstance parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ];
+
+ // if we have an external redirect just bail
+ if ( CompilerUtils.getBoolean( parentAnnotation, EXTERNAL_REDIRECT_ATTR, false ).booleanValue() )
+ {
+ return null;
+ }
+
+ return super.onCheck( valueDecl, value, parentAnnotations, classMember, annotationArrayIndex );
+ }
+}
Propchange: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExternalPathOrActionType.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/compiler-xdoclet/build.xml.old
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-xdoclet/build.xml.old?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-xdoclet/build.xml.old (original)
+++ beehive/trunk/netui/src/compiler-xdoclet/build.xml.old Wed May 10 08:49:42 2006
@@ -1,191 +1,191 @@
-<?xml version="1.0"?>
-
-<project name="NetUI/XDoclet Compiler" default="compile" basedir=".">
-
- <property name="module.classpath" value="${pageflow.jar};${compiler.jar};${commons-logging.jar};${commons-collections.jar};${xdoclet.jar};${xjavadoc.jar};${xbean.jar}"/>
-
- <!-- Module specific properties used by the xdoclet portions of the build -->
- <property name="module.build.dir" value="${classes.dir}/${module.name}"/>
- <property name="module.jar.file" value="${dist.dir}/xdoclet-${ant.project.name}-module-${version}.jar"/>
- <property name="xdoclet-xml.dir" value="${module.build.dir}/META-INF"/>
- <property name="module.tag.docs.file" value="${docs.tags.dir}/${ant.project.name}-tags.xml"/>
- <property name="xdoclet-xml.template.file" value="${basedir}/xdoclet-xml.xdt" />
-
-
- <!-- =================================================================== -->
- <!-- Initialises the build. -->
- <!-- =================================================================== -->
- <target name="init">
- <!-- Define classpath required for compiling modules -->
- <path id="module.compile.class.path">
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- </fileset>
-
- <fileset dir="${dist.dir}">
- <!-- include previously built jars -->
- <include name="*.jar"/>
- </fileset>
-
- <!-- Include core classes, might not have been jarred yet -->
- <!-- pathelement location="${core.classes.dir}"/ -->
- <pathelement location="${xdoclet.jar}" />
- </path>
-
- <mkdir dir="${module.build.dir}"/>
-
- <path id="module.xml.class.path">
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${dist.dir}">
- <!-- include previously built jars -->
- <include name="*.jar"/>
- </fileset>
- <!-- include classes from this module -->
- <pathelement location="${module.build.dir}"/>
- <!-- include resources from this module -->
- <pathelement location="${basedir}"/>
-
- <!--
- Include classes from the core. The core is also a module,
- since it contains an xdoclet.xml and core taghandlers.
- This is required only because of the externalizer, which
- is invoked by the core build before the xdoclet.jar file
- is assembled.
- -->
- <!-- pathelement location="${core.classes.dir}"/ -->
- <pathelement location="${xdoclet.jar}" />
- </path>
-
- <condition property="file.url.prefix" value="file://">
- <os family="unix" />
- </condition>
- <condition property="file.url.prefix" value="file:/">
- <os family="windows" />
- </condition>
-
- <!-- Checks if the module jar is uptodate -->
- <uptodate property="module.jar.uptodate" targetfile="${module.jar.file}">
- <srcfiles dir="${basedir}"/>
- </uptodate>
-
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Generates an xdoclet.xml deployment descriptor for xdoclet modules -->
- <!-- =================================================================== -->
- <target name="xdoclet-xml"
- description="Generates an xdoclet.xml deployment descriptor for xdoclet modules"
- unless="module.jar.uptodate"
- depends="sub-compile"
- >
- <!--
- Define classpath required for generating xml descriptors
- We're including our own classes on the class path because
- the module might contain a subtask which depends on a doclettask
- in the same module. all classes have to be on the classpath for
- the xdoclet.xml generation to succeed. The classpath has to be defined
- *after* compilation because Ant will strip away nonexistant
- paths from the classpath. (The class directory doesn't exist before
- the classes are compiled).
- -->
- <!-- Define the xdoclet task -->
- <taskdef name="xdoclet" classname="xdoclet.DocletTask"
- classpath="${module.classpath}"
- />
-
- <mkdir dir="${xdoclet-xml.dir}"/>
- <xdoclet destdir="${xdoclet-xml.dir}">
-
- <fileset dir="${basedir}">
- <include name="**/*Handler.java" />
- <include name="**/*SubTask.java" />
- </fileset>
-
- <template
- templateFile="${xdoclet-xml.template.file}"
- destinationFile="xdoclet.xml"
- />
- </xdoclet>
- </target>
-
- <!-- the main task; this will run the XDoclet validation, compile the classes, run the XDoclet xml gen, and jar it all up -->
- <target name="compile" depends="sub-compile,xdoclet-xml,jar" />
-
- <target name="sub-compile" >
- <echo>Compile module: ${module.name}</echo>
- <echo>module.classpath: ${module.classpath}</echo>
- <echo>dist.dir=${dist.dir}</echo>
- <echo>Debug=${compile.debug}</echo>
-
- <mkdir dir="${classes.dir}/${module.name}"/>
-
- <javac srcdir="."
- destdir="${classes.dir}/${module.name}"
- classpath="${module.classpath}"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}"
- source="${compile.source}">
- <include name="**/*.java"/>
- </javac>
- <copy todir="${classes.dir}/${module.name}">
- <fileset dir="." >
- <include name="**/*.properties"/>
- <include name="**/*.dtd"/>
- <include name="**/*.xdt"/>
- <include name="**/*.xml"/>
- <exclude name="**/xdoclet-xml.xdt" />
- <exclude name="**/build.xml" />
- </fileset>
- </copy>
- </target>
-
- <target name="jar" depends="sub-compile, xdoclet-xml">
- <jar jarfile="${dist.tomcat.dir}/${xdoclet-compiler.jar.name}">
- <fileset dir="${classes.dir}/${module.name}">
- <include name="**/*.class"/>
- <include name="**/*.properties"/>
- <include name="**/*.dtd"/>
- <include name="**/*.xdt"/>
- <include name="**/*.xml"/>
- </fileset>
-
- <!-- Include com.bea.wlw.netui.pageflow.model from the compiler module.
- <fileset dir="${classes.dir}/compiler">
- <include name="com/bea/wlw/netui/pageflow/model/**/*.class"/>
- <include name="com/bea/wlw/netui/pageflow/schema/**/*.class"/>
- <include name="schema/**/*.class"/>
- <include name="com/bea/wlw/netui/pageflow/compiler/*Constants*.class"/>
- <include name="com/bea/wlw/netui/pageflow/compiler/*.properties"/>
- <include name="**/*.xsd"/>
- <include name="**/*.xsb"/>
- </fileset>
- -->
- </jar>
- </target>
-
- <target name="clean">
- <delete dir="${classes.dir}/${module.name}"/>
- <delete file="${dist.tomcat.dir}/${xdoclet-compiler.jar.name}" failonerror="false"/>
- </target>
-
- <target name="javadoc">
- <mkdir dir="${javadoc.dir}/${module.name}"/>
- <javadoc packagenames="${javadoc.packages}"
- sourcepath="."
- destdir="${javadoc.dir}/${module.name}"
- version="true"
- windowtitle="${javadoc.windowtitle}"
- >
- <link href="${j2ee.docs}"/>
- </javadoc>
- </target>
-
- <target name="clean.javadoc">
- <delete dir="${javadoc.dir}/${module.name}" includeEmptyDirs="true"/>
- </target>
-
-</project>
+<?xml version="1.0"?>
+
+<project name="NetUI/XDoclet Compiler" default="compile" basedir=".">
+
+ <property name="module.classpath" value="${pageflow.jar};${compiler.jar};${commons-logging.jar};${commons-collections.jar};${xdoclet.jar};${xjavadoc.jar};${xbean.jar}"/>
+
+ <!-- Module specific properties used by the xdoclet portions of the build -->
+ <property name="module.build.dir" value="${classes.dir}/${module.name}"/>
+ <property name="module.jar.file" value="${dist.dir}/xdoclet-${ant.project.name}-module-${version}.jar"/>
+ <property name="xdoclet-xml.dir" value="${module.build.dir}/META-INF"/>
+ <property name="module.tag.docs.file" value="${docs.tags.dir}/${ant.project.name}-tags.xml"/>
+ <property name="xdoclet-xml.template.file" value="${basedir}/xdoclet-xml.xdt" />
+
+
+ <!-- =================================================================== -->
+ <!-- Initialises the build. -->
+ <!-- =================================================================== -->
+ <target name="init">
+ <!-- Define classpath required for compiling modules -->
+ <path id="module.compile.class.path">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+
+ <fileset dir="${dist.dir}">
+ <!-- include previously built jars -->
+ <include name="*.jar"/>
+ </fileset>
+
+ <!-- Include core classes, might not have been jarred yet -->
+ <!-- pathelement location="${core.classes.dir}"/ -->
+ <pathelement location="${xdoclet.jar}" />
+ </path>
+
+ <mkdir dir="${module.build.dir}"/>
+
+ <path id="module.xml.class.path">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${dist.dir}">
+ <!-- include previously built jars -->
+ <include name="*.jar"/>
+ </fileset>
+ <!-- include classes from this module -->
+ <pathelement location="${module.build.dir}"/>
+ <!-- include resources from this module -->
+ <pathelement location="${basedir}"/>
+
+ <!--
+ Include classes from the core. The core is also a module,
+ since it contains an xdoclet.xml and core taghandlers.
+ This is required only because of the externalizer, which
+ is invoked by the core build before the xdoclet.jar file
+ is assembled.
+ -->
+ <!-- pathelement location="${core.classes.dir}"/ -->
+ <pathelement location="${xdoclet.jar}" />
+ </path>
+
+ <condition property="file.url.prefix" value="file://">
+ <os family="unix" />
+ </condition>
+ <condition property="file.url.prefix" value="file:/">
+ <os family="windows" />
+ </condition>
+
+ <!-- Checks if the module jar is uptodate -->
+ <uptodate property="module.jar.uptodate" targetfile="${module.jar.file}">
+ <srcfiles dir="${basedir}"/>
+ </uptodate>
+
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Generates an xdoclet.xml deployment descriptor for xdoclet modules -->
+ <!-- =================================================================== -->
+ <target name="xdoclet-xml"
+ description="Generates an xdoclet.xml deployment descriptor for xdoclet modules"
+ unless="module.jar.uptodate"
+ depends="sub-compile"
+ >
+ <!--
+ Define classpath required for generating xml descriptors
+ We're including our own classes on the class path because
+ the module might contain a subtask which depends on a doclettask
+ in the same module. all classes have to be on the classpath for
+ the xdoclet.xml generation to succeed. The classpath has to be defined
+ *after* compilation because Ant will strip away nonexistant
+ paths from the classpath. (The class directory doesn't exist before
+ the classes are compiled).
+ -->
+ <!-- Define the xdoclet task -->
+ <taskdef name="xdoclet" classname="xdoclet.DocletTask"
+ classpath="${module.classpath}"
+ />
+
+ <mkdir dir="${xdoclet-xml.dir}"/>
+ <xdoclet destdir="${xdoclet-xml.dir}">
+
+ <fileset dir="${basedir}">
+ <include name="**/*Handler.java" />
+ <include name="**/*SubTask.java" />
+ </fileset>
+
+ <template
+ templateFile="${xdoclet-xml.template.file}"
+ destinationFile="xdoclet.xml"
+ />
+ </xdoclet>
+ </target>
+
+ <!-- the main task; this will run the XDoclet validation, compile the classes, run the XDoclet xml gen, and jar it all up -->
+ <target name="compile" depends="sub-compile,xdoclet-xml,jar" />
+
+ <target name="sub-compile" >
+ <echo>Compile module: ${module.name}</echo>
+ <echo>module.classpath: ${module.classpath}</echo>
+ <echo>dist.dir=${dist.dir}</echo>
+ <echo>Debug=${compile.debug}</echo>
+
+ <mkdir dir="${classes.dir}/${module.name}"/>
+
+ <javac srcdir="."
+ destdir="${classes.dir}/${module.name}"
+ classpath="${module.classpath}"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ source="${compile.source}">
+ <include name="**/*.java"/>
+ </javac>
+ <copy todir="${classes.dir}/${module.name}">
+ <fileset dir="." >
+ <include name="**/*.properties"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.xdt"/>
+ <include name="**/*.xml"/>
+ <exclude name="**/xdoclet-xml.xdt" />
+ <exclude name="**/build.xml" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="jar" depends="sub-compile, xdoclet-xml">
+ <jar jarfile="${dist.tomcat.dir}/${xdoclet-compiler.jar.name}">
+ <fileset dir="${classes.dir}/${module.name}">
+ <include name="**/*.class"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.xdt"/>
+ <include name="**/*.xml"/>
+ </fileset>
+
+ <!-- Include com.bea.wlw.netui.pageflow.model from the compiler module.
+ <fileset dir="${classes.dir}/compiler">
+ <include name="com/bea/wlw/netui/pageflow/model/**/*.class"/>
+ <include name="com/bea/wlw/netui/pageflow/schema/**/*.class"/>
+ <include name="schema/**/*.class"/>
+ <include name="com/bea/wlw/netui/pageflow/compiler/*Constants*.class"/>
+ <include name="com/bea/wlw/netui/pageflow/compiler/*.properties"/>
+ <include name="**/*.xsd"/>
+ <include name="**/*.xsb"/>
+ </fileset>
+ -->
+ </jar>
+ </target>
+
+ <target name="clean">
+ <delete dir="${classes.dir}/${module.name}"/>
+ <delete file="${dist.tomcat.dir}/${xdoclet-compiler.jar.name}" failonerror="false"/>
+ </target>
+
+ <target name="javadoc">
+ <mkdir dir="${javadoc.dir}/${module.name}"/>
+ <javadoc packagenames="${javadoc.packages}"
+ sourcepath="."
+ destdir="${javadoc.dir}/${module.name}"
+ version="true"
+ windowtitle="${javadoc.windowtitle}"
+ >
+ <link href="${j2ee.docs}"/>
+ </javadoc>
+ </target>
+
+ <target name="clean.javadoc">
+ <delete dir="${javadoc.dir}/${module.name}" includeEmptyDirs="true"/>
+ </target>
+
+</project>
Propchange: beehive/trunk/netui/src/compiler-xdoclet/build.xml.old
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/compiler-xdoclet/xdoclet-xml.xdt
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-xdoclet/xdoclet-xml.xdt?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-xdoclet/xdoclet-xml.xdt (original)
+++ beehive/trunk/netui/src/compiler-xdoclet/xdoclet-xml.xdt Wed May 10 08:49:42 2006
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-<!DOCTYPE xdoclet-module PUBLIC "-//XDoclet Team//DTD XDoclet Module 1.0//EN" "http://xdoclet.sourceforge.net/dtd/xdoclet-module_1_0.dtd">
--->
-
-<XDtComment:comment>
-This template builds the deployment descriptor for modules
-</XDtComment:comment>
-
-<xdoclet-module>
- <!--
- <XDtClass:forAllClasses>
- <XDtClass:fullClassName/>
- </XDtClass:forAllClasses>
- -->
-
- <XDtClass:forAllClasses type="xdoclet.template.TemplateTagHandler" abstract="false">
- <taghandler
- namespace="<XDtClass:classTagValue tagName="xdoclet.taghandler" paramName="namespace" mandatory="true"/>"
- class="<XDtClass:fullClassName/>"
- />
- </XDtClass:forAllClasses>
-
- <XDtClass:forAllClasses type="xdoclet.SubTask" abstract="false">
- <subtask
- name="<XDtClass:classTagValue tagName="ant.element" paramName="name" mandatory="true"/>"
- implementation-class="<XDtClass:fullClassName/>"
- parent-task-class="<XDtClass:classTagValue tagName="ant.element" paramName="parent" mandatory="true"/>"
- />
- </XDtClass:forAllClasses>
-</xdoclet-module>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+<!DOCTYPE xdoclet-module PUBLIC "-//XDoclet Team//DTD XDoclet Module 1.0//EN" "http://xdoclet.sourceforge.net/dtd/xdoclet-module_1_0.dtd">
+-->
+
+<XDtComment:comment>
+This template builds the deployment descriptor for modules
+</XDtComment:comment>
+
+<xdoclet-module>
+ <!--
+ <XDtClass:forAllClasses>
+ <XDtClass:fullClassName/>
+ </XDtClass:forAllClasses>
+ -->
+
+ <XDtClass:forAllClasses type="xdoclet.template.TemplateTagHandler" abstract="false">
+ <taghandler
+ namespace="<XDtClass:classTagValue tagName="xdoclet.taghandler" paramName="namespace" mandatory="true"/>"
+ class="<XDtClass:fullClassName/>"
+ />
+ </XDtClass:forAllClasses>
+
+ <XDtClass:forAllClasses type="xdoclet.SubTask" abstract="false">
+ <subtask
+ name="<XDtClass:classTagValue tagName="ant.element" paramName="name" mandatory="true"/>"
+ implementation-class="<XDtClass:fullClassName/>"
+ parent-task-class="<XDtClass:classTagValue tagName="ant.element" paramName="parent" mandatory="true"/>"
+ />
+ </XDtClass:forAllClasses>
+</xdoclet-module>
Propchange: beehive/trunk/netui/src/compiler-xdoclet/xdoclet-xml.xdt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/core/org/apache/beehive/netui/core/URLCodec.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/core/org/apache/beehive/netui/core/URLCodec.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/core/org/apache/beehive/netui/core/URLCodec.java (original)
+++ beehive/trunk/netui/src/core/org/apache/beehive/netui/core/URLCodec.java Wed May 10 08:49:42 2006
@@ -1,87 +1,87 @@
-/*
- * 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.core;
-
-import java.io.UnsupportedEncodingException;
-
-import org.apache.commons.codec.EncoderException;
-import org.apache.commons.codec.DecoderException;
-
-import org.apache.beehive.netui.util.Bundle;
-
-/**
- * Class that provides static methods for URL encoding/decoding
- */
-public final class URLCodec {
-
- private final static org.apache.commons.codec.net.URLCodec s_codec =
- new org.apache.commons.codec.net.URLCodec();
-
- /**
- * URL encodes a string.
- * @param decoded the string to encode
- * @param charset the character set to use
- * @return the encoded string
- */
- public static String encode(final String decoded, final String charset)
- throws UnsupportedEncodingException {
- return s_codec.encode(decoded, charset);
- }
-
- /**
- * URL encodes a string using the default character set
- * @param decoded the string to encode
- * @return the encoded string
- */
- public static String encode(final String decoded) {
- try {
- return s_codec.encode(decoded);
- } catch (EncoderException e) {
- throw new IllegalStateException(Bundle.getErrorString("URLCodec_encodeException", new String[] {e.getMessage()}), e);
- }
- }
-
- /**
- * URL decodes a string.
- * @param encoded the string to decode
- * @param charset the character set to use
- * @return the decoded string
- */
- public static String decode(final String encoded, final String charset)
- throws UnsupportedEncodingException {
- try {
- return s_codec.decode(encoded, charset);
- } catch (DecoderException e) {
- throw new IllegalStateException(Bundle.getErrorString("URLCodec_decodeException", new String[] {e.getMessage()}), e);
- }
- }
-
-
- /**
- * URL decodes a string using the default character set
- * @param encoded the string to decode
- * @return the decoded string
- */
- public static String decode(final String encoded) {
- try {
- return s_codec.decode(encoded);
- } catch (DecoderException e) {
- throw new IllegalStateException(Bundle.getErrorString("URLCodec_decodeException", new String[] {e.getMessage()}), e);
- }
- }
-}
+/*
+ * 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.core;
+
+import java.io.UnsupportedEncodingException;
+
+import org.apache.commons.codec.EncoderException;
+import org.apache.commons.codec.DecoderException;
+
+import org.apache.beehive.netui.util.Bundle;
+
+/**
+ * Class that provides static methods for URL encoding/decoding
+ */
+public final class URLCodec {
+
+ private final static org.apache.commons.codec.net.URLCodec s_codec =
+ new org.apache.commons.codec.net.URLCodec();
+
+ /**
+ * URL encodes a string.
+ * @param decoded the string to encode
+ * @param charset the character set to use
+ * @return the encoded string
+ */
+ public static String encode(final String decoded, final String charset)
+ throws UnsupportedEncodingException {
+ return s_codec.encode(decoded, charset);
+ }
+
+ /**
+ * URL encodes a string using the default character set
+ * @param decoded the string to encode
+ * @return the encoded string
+ */
+ public static String encode(final String decoded) {
+ try {
+ return s_codec.encode(decoded);
+ } catch (EncoderException e) {
+ throw new IllegalStateException(Bundle.getErrorString("URLCodec_encodeException", new String[] {e.getMessage()}), e);
+ }
+ }
+
+ /**
+ * URL decodes a string.
+ * @param encoded the string to decode
+ * @param charset the character set to use
+ * @return the decoded string
+ */
+ public static String decode(final String encoded, final String charset)
+ throws UnsupportedEncodingException {
+ try {
+ return s_codec.decode(encoded, charset);
+ } catch (DecoderException e) {
+ throw new IllegalStateException(Bundle.getErrorString("URLCodec_decodeException", new String[] {e.getMessage()}), e);
+ }
+ }
+
+
+ /**
+ * URL decodes a string using the default character set
+ * @param encoded the string to decode
+ * @return the decoded string
+ */
+ public static String decode(final String encoded) {
+ try {
+ return s_codec.decode(encoded);
+ } catch (DecoderException e) {
+ throw new IllegalStateException(Bundle.getErrorString("URLCodec_decodeException", new String[] {e.getMessage()}), e);
+ }
+ }
+}
Propchange: beehive/trunk/netui/src/core/org/apache/beehive/netui/core/URLCodec.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/core/org/apache/beehive/netui/core/chain/Catalog.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/core/org/apache/beehive/netui/core/chain/Catalog.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/src/core/org/apache/beehive/netui/core/chain/Catalog.java (original)
+++ beehive/trunk/netui/src/core/org/apache/beehive/netui/core/chain/Catalog.java Wed May 10 08:49:42 2006
@@ -1,35 +1,35 @@
-/*
- * 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.core.chain;
-
-import java.util.Iterator;
-
-/**
- * <p>
- * A Catalog is a collection of {@link Command}s or {@link Chain}s. It is used as a convenience
- * for organizing sets of {@link Command}s together.
- * </p>
- */
-public interface Catalog {
-
- void addCommand(String name, Command command);
-
- Command getCommand(String name);
-
- Iterator getNames();
-}
+/*
+ * 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.core.chain;
+
+import java.util.Iterator;
+
+/**
+ * <p>
+ * A Catalog is a collection of {@link Command}s or {@link Chain}s. It is used as a convenience
+ * for organizing sets of {@link Command}s together.
+ * </p>
+ */
+public interface Catalog {
+
+ void addCommand(String name, Command command);
+
+ Command getCommand(String name);
+
+ Iterator getNames();
+}
Propchange: beehive/trunk/netui/src/core/org/apache/beehive/netui/core/chain/Catalog.java
------------------------------------------------------------------------------
svn:eol-style = native