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/11/20 18:10:44 UTC
svn commit: r477258 - in /beehive/trunk: ./ controls/src/
controls/src/runtime/META-INF/services/ docs/ docs/source-header/
netui/src/compiler-apt/ netui/src/compiler-apt/META-INF/services/
netui/src/core/org/apache/beehive/netui/core/urltemplates/sche...
Author: ekoneil
Date: Mon Nov 20 09:10:42 2006
New Revision: 477258
URL: http://svn.apache.org/viewvc?view=rev&rev=477258
Log:
Changes:
- Update trunk/ with lots of new license headers.
- Reorganize the docs/source-headers.txt file into docs/source-header/*.txt so that it's easier to 'cat' license headers onto files that are missing them.
- Fixup the NOTICE and LICENSE files which were missing relevant information for the JSR-166 source / binaries and Spring code that is shipped with the Beehive distribution.
Test: Controls / NetUI / System Controls pass
Added:
beehive/trunk/docs/source-header/
beehive/trunk/docs/source-header/README.txt
beehive/trunk/docs/source-header/java.txt
beehive/trunk/docs/source-header/jsp.txt
beehive/trunk/docs/source-header/properties.txt
beehive/trunk/docs/source-header/xml.txt
Removed:
beehive/trunk/docs/source-header.txt
Modified:
beehive/trunk/LICENSE.txt
beehive/trunk/NOTICE.txt
beehive/trunk/controls/src/beehive-controls.pom
beehive/trunk/controls/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
beehive/trunk/netui/src/compiler-apt/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
beehive/trunk/netui/src/compiler-apt/beehive-netui-compiler.pom
beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urltemplates/schema/url-template-config.xsd
beehive/trunk/netui/src/pageflow/beehive-netui-core.pom
beehive/trunk/netui/src/tags-html/beehive-netui-tags.pom
beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/javaScript.properties
beehive/trunk/netui/test/webapps/drt/web/WEB-INF/beehive-netui-config.xml
beehive/trunk/netui/test/webapps/drt/web/WEB-INF/web.xml
beehive/trunk/samples/netui-jsf/web/WEB-INF/beehive-netui-validator-rules.xml
beehive/trunk/samples/netui-jsf/web/WEB-INF/faces-config.xml
beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.jsf-ri
beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.myfaces
beehive/trunk/samples/netui-samples/src/advanced/dynaforms/merge-struts-config-dynaforms.xml
beehive/trunk/samples/netui-samples/src/log4j.xml
beehive/trunk/samples/netui-samples/web/WEB-INF/beehive-netui-config.xml
beehive/trunk/samples/netui-samples/web/WEB-INF/beehive-netui-validator-rules.xml
beehive/trunk/samples/netui-samples/web/WEB-INF/custom-validator-rules.xml
beehive/trunk/samples/netui-samples/web/WEB-INF/tiles-defs.xml
beehive/trunk/samples/netui-samples/web/WEB-INF/web.xml
beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/index.jsp
beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/success.jsp
beehive/trunk/samples/netui-samples/web/advanced/customvalidator/index.jsp
beehive/trunk/samples/netui-samples/web/advanced/customvalidator/success.jsp
beehive/trunk/samples/netui-samples/web/advanced/dynaforms/input.jsp
beehive/trunk/samples/netui-samples/web/advanced/dynaforms/output.jsp
beehive/trunk/samples/netui-samples/web/ui/datagrid/sortandfilter/index.jsp
beehive/trunk/samples/system-controls-jdbc/web/demo.jsp
beehive/trunk/samples/system-controls-jdbc/web/details.jsp
beehive/trunk/samples/system-controls-jdbc/web/index.jsp
beehive/trunk/samples/system-controls-jdbc/web/sql.jsp
beehive/trunk/system-controls/src/ejb/beehive-ejb-control.pom
beehive/trunk/system-controls/src/jdbc/beehive-jdbc-control.pom
beehive/trunk/system-controls/src/jms/beehive-jms-control.pom
Modified: beehive/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/beehive/trunk/LICENSE.txt?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/LICENSE.txt (original)
+++ beehive/trunk/LICENSE.txt Mon Nov 20 09:10:42 2006
@@ -200,3 +200,53 @@
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.
+
+============================================
+ Licenses for Included Dependencies
+============================================
+
+The exceptions are as follows:
+
+============================================
+ org/apache/beehive/netui/util/internal/concurrent/**
+============================================
+
+ "Sun hereby grants you a non-exclusive, worldwide, non-transferrable
+ license to use and distribute the Java Software technologies as part
+ of a larger work in source and binary forms, with or without
+ modification, provided that the following conditions are met:
+
+ -Neither the name of or trademarks of Sun may be used to endorse or
+ promote products derived from the Java Software technology without
+ specific prior written permission.
+
+ -Redistributions of source or binary code must be accompanied by the
+ following notice and disclaimers:
+
+ Portions copyright Sun Microsystems, Inc. Used with kind permission.
+
+ This software is provided AS IS, without a warranty of any kind. ALL
+ EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
+ WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PUPOSE OR
+ NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE
+ FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
+ USING, MODIFYING OR DISTRIBUTING THE SOFTWARE OR ITS
+ DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR
+ ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR
+ DATA, OR FOR DIRECT, INDIRECT,CONSQUENTIAL, INCIDENTAL
+ OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF
+ THE THEORY OR LIABILITY, ARISING OUT OF THE USE OF OR
+ INABILITY TO USE SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC.
+ HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ You acknowledge that Software is not designed, licensed or intended for
+ use in the design, construction, operation or maintenance of any nuclear
+ facility."
+
+============================================
+ Spring Framework 1.1.5
+============================================
+
+ Licensed under terms of the Apache Software License (ASL) 2.0, provided above.
\ No newline at end of file
Modified: beehive/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/beehive/trunk/NOTICE.txt?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/NOTICE.txt (original)
+++ beehive/trunk/NOTICE.txt Mon Nov 20 09:10:42 2006
@@ -8,17 +8,27 @@
Portions of this software were originally based on the following:
- - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
+ * software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
and are licensed to the Apache Software Foundation under the
"Software Grant and Corporate Contribution License Agreement"
Aside from contributions to the Apache Beehive project, this
software also includes:
- - one or more JARs from various Apache projects:
- - Ant, Axis, Jakarta Commons, Log4J, Struts, Tomcat, and Velocity.
- Copyright (c) 1999-2005 Apache Software Foundation
+ * One or more JARs from the Jakarta Commons, Jakarta ORO, Log4J,
+ Struts, and Velocity Apache projects, Copyright (c) 1999-2006
+ Apache Software Foundation
-See the LICENSE.txt file for information on all licenses
-associated with this software.
+ * One or more JARs from the Spring Framework Project
+See the LICENSE.txt file for information on all licenses associated with
+this software.
+
+COPYRIGHT NOTICES:
+
+* Apache Beehive is bundled with source and binaries from the JSR-166
+ implementation licensed under the relevant license in LICENSE.txt.
+ The source code and license are avaialble at:
+ http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/src/main/readme
+
+* Apache Beehive is bundled with binaries from The Spring Framework Project
\ No newline at end of file
Modified: beehive/trunk/controls/src/beehive-controls.pom
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/src/beehive-controls.pom?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/controls/src/beehive-controls.pom (original)
+++ beehive/trunk/controls/src/beehive-controls.pom Mon Nov 20 09:10:42 2006
@@ -1,5 +1,24 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
+
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.beehive</groupId>
Modified: beehive/trunk/controls/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/controls/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory (original)
+++ beehive/trunk/controls/src/runtime/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory Mon Nov 20 09:10:42 2006
@@ -1,4 +1,23 @@
#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $Header:$
+#
+
+#
# This configures APT so the ControlProcessorFactory can be used to process Control annotations
#
org.apache.beehive.controls.runtime.generator.apt.ControlAnnotationProcessorFactory
Added: beehive/trunk/docs/source-header/README.txt
URL: http://svn.apache.org/viewvc/beehive/trunk/docs/source-header/README.txt?view=auto&rev=477258
==============================================================================
--- beehive/trunk/docs/source-header/README.txt (added)
+++ beehive/trunk/docs/source-header/README.txt Mon Nov 20 09:10:42 2006
@@ -0,0 +1,6 @@
+This directory contains source headers for a variety of file types.
+
+For more information, see:
+
+ http://apache.org/legal/src-headers.html
+
Added: beehive/trunk/docs/source-header/java.txt
URL: http://svn.apache.org/viewvc/beehive/trunk/docs/source-header/java.txt?view=auto&rev=477258
==============================================================================
--- beehive/trunk/docs/source-header/java.txt (added)
+++ beehive/trunk/docs/source-header/java.txt Mon Nov 20 09:10:42 2006
@@ -0,0 +1,18 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
Added: beehive/trunk/docs/source-header/jsp.txt
URL: http://svn.apache.org/viewvc/beehive/trunk/docs/source-header/jsp.txt?view=auto&rev=477258
==============================================================================
--- beehive/trunk/docs/source-header/jsp.txt (added)
+++ beehive/trunk/docs/source-header/jsp.txt Mon Nov 20 09:10:42 2006
@@ -0,0 +1,18 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+--%>
Added: beehive/trunk/docs/source-header/properties.txt
URL: http://svn.apache.org/viewvc/beehive/trunk/docs/source-header/properties.txt?view=auto&rev=477258
==============================================================================
--- beehive/trunk/docs/source-header/properties.txt (added)
+++ beehive/trunk/docs/source-header/properties.txt Mon Nov 20 09:10:42 2006
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $Header:$
+#
Added: beehive/trunk/docs/source-header/xml.txt
URL: http://svn.apache.org/viewvc/beehive/trunk/docs/source-header/xml.txt?view=auto&rev=477258
==============================================================================
--- beehive/trunk/docs/source-header/xml.txt (added)
+++ beehive/trunk/docs/source-header/xml.txt Mon Nov 20 09:10:42 2006
@@ -0,0 +1,18 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
Modified: beehive/trunk/netui/src/compiler-apt/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/compiler-apt/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- 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 Mon Nov 20 09:10:42 2006
@@ -1 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $Header:$
+#
+
org.apache.beehive.netui.compiler.apt.PageFlowAnnotationProcessorFactory
Modified: beehive/trunk/netui/src/compiler-apt/beehive-netui-compiler.pom
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/compiler-apt/beehive-netui-compiler.pom?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/netui/src/compiler-apt/beehive-netui-compiler.pom (original)
+++ beehive/trunk/netui/src/compiler-apt/beehive-netui-compiler.pom Mon Nov 20 09:10:42 2006
@@ -1,5 +1,24 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
+
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.beehive</groupId>
Modified: beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urltemplates/schema/url-template-config.xsd
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urltemplates/schema/url-template-config.xsd?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urltemplates/schema/url-template-config.xsd (original)
+++ beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urltemplates/schema/url-template-config.xsd Mon Nov 20 09:10:42 2006
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
+
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://beehive.apache.org/netui/2004/server/url-template-config"
xmlns:netui="http://beehive.apache.org/netui/2004/server/url-template-config"
Modified: beehive/trunk/netui/src/pageflow/beehive-netui-core.pom
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/pageflow/beehive-netui-core.pom?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/netui/src/pageflow/beehive-netui-core.pom (original)
+++ beehive/trunk/netui/src/pageflow/beehive-netui-core.pom Mon Nov 20 09:10:42 2006
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
<project>
<modelVersion>4.0.0</modelVersion>
Modified: beehive/trunk/netui/src/tags-html/beehive-netui-tags.pom
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/tags-html/beehive-netui-tags.pom?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/netui/src/tags-html/beehive-netui-tags.pom (original)
+++ beehive/trunk/netui/src/tags-html/beehive-netui-tags.pom Mon Nov 20 09:10:42 2006
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
<project>
<modelVersion>4.0.0</modelVersion>
Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/javaScript.properties
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/javaScript.properties?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/javaScript.properties (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/javaScript.properties Mon Nov 20 09:10:42 2006
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $Header:$
+#
+
# This properties files defines all of the JavaScript generated by the HTML
# tags. This file does not need I18N support. In fact, if this is internationalized
# the JavaScriptUtils class needs updating because it caches the Bundle internally
Modified: beehive/trunk/netui/test/webapps/drt/web/WEB-INF/beehive-netui-config.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/web/WEB-INF/beehive-netui-config.xml?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/WEB-INF/beehive-netui-config.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/web/WEB-INF/beehive-netui-config.xml Mon Nov 20 09:10:42 2006
@@ -182,23 +182,6 @@
<id-javascript>legacy</id-javascript>
</jsp-tag-config>
- <!-- This request-interceptors block is used to ensure that the RequestInterceptor pattern
- continues to work. For subsequent Beehive releases, the preferred pattern is
- to use the Command/Chain Catalog
- -->
-<!--
- <request-interceptors>
- <global>
- <request-interceptor>
- <interceptor-class>org.apache.beehive.netui.tags.tree.TreeCRI</interceptor-class>
- </request-interceptor>
- <request-interceptor>
- <interceptor-class>org.apache.beehive.netui.tags.divpanel.DivPanelCRI</interceptor-class>
- </request-interceptor>
- </global>
- </request-interceptors>
--->
-
<catalog>
<chain name="xhr-commands">
<command>
Modified: beehive/trunk/netui/test/webapps/drt/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/web/WEB-INF/web.xml?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/WEB-INF/web.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/web/WEB-INF/web.xml Mon Nov 20 09:10:42 2006
@@ -11,14 +11,6 @@
<param-value>true</param-value>
</context-param>
- <listener>
- <listener-class>org.apache.beehive.netui.pageflow.PageFlowContextListener</listener-class>
- </listener>
-
- <listener>
- <listener-class>org.apache.beehive.netui.pageflow.HttpSessionMutexListener</listener-class>
- </listener>
-
<!-- Test Recorder Filter -->
<filter>
<filter-name>TestRecorderFilter</filter-name>
@@ -76,6 +68,14 @@
<dispatcher>INCLUDE</dispatcher>
</filter-mapping>
+ <listener>
+ <listener-class>org.apache.beehive.netui.pageflow.PageFlowContextListener</listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>org.apache.beehive.netui.pageflow.HttpSessionMutexListener</listener-class>
+ </listener>
+
<!-- Test Recorder Servlet (control channel) -->
<servlet>
<servlet-name>TestRecorderServlet</servlet-name>
@@ -133,21 +133,22 @@
<servlet-name>IncludeJPF</servlet-name>
<servlet-class>miniTests.servletInclude.IncludeJPFServlet</servlet-class>
</servlet>
- <servlet-mapping>
- <servlet-name>IncludeJPF</servlet-name>
- <url-pattern>/includejpf/*</url-pattern>
- </servlet-mapping>
<!-- The following servlet and servlet-mapping are for the CreatePageFlow test. -->
<servlet>
<servlet-name>CreatePageFlow</servlet-name>
<servlet-class>miniTests.createPageFlow.CreatePageFlowServlet</servlet-class>
</servlet>
+
+ <servlet-mapping>
+ <servlet-name>IncludeJPF</servlet-name>
+ <url-pattern>/includejpf/*</url-pattern>
+ </servlet-mapping>
+
<servlet-mapping>
<servlet-name>CreatePageFlow</servlet-name>
<url-pattern>/createPageFlow/*</url-pattern>
</servlet-mapping>
-
<!-- Struts Action Servlet Mapping -->
<!-- Note that because Struts takes the *last* mapping here as the extension to add to
@@ -253,19 +254,6 @@
</user-data-constraint>
</security-constraint>
- <security-role>
- <description>Test role for /miniTests/roles</description>
- <role-name>GoodRole1</role-name>
- </security-role>
- <security-role>
- <description>Test role for /miniTests/roles</description>
- <role-name>GoodRole2</role-name>
- </security-role>
- <security-role>
- <description>Test role for /miniTests/roles</description>
- <role-name>BadRole</role-name>
- </security-role>
-
<!-- Security constraints for the jpfSecurity tests -->
<security-constraint>
<web-resource-collection>
@@ -286,6 +274,7 @@
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint>
</security-constraint>
+
<security-constraint>
<display-name>Security Constraints</display-name>
<web-resource-collection>
@@ -304,4 +293,18 @@
<transport-guarantee>NONE</transport-guarantee>
</user-data-constraint>
</security-constraint>
+
+ <security-role>
+ <description>Test role for /miniTests/roles</description>
+ <role-name>GoodRole1</role-name>
+ </security-role>
+ <security-role>
+ <description>Test role for /miniTests/roles</description>
+ <role-name>GoodRole2</role-name>
+ </security-role>
+ <security-role>
+ <description>Test role for /miniTests/roles</description>
+ <role-name>BadRole</role-name>
+ </security-role>
+
</web-app>
Modified: beehive/trunk/samples/netui-jsf/web/WEB-INF/beehive-netui-validator-rules.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-jsf/web/WEB-INF/beehive-netui-validator-rules.xml?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-jsf/web/WEB-INF/beehive-netui-validator-rules.xml (original)
+++ beehive/trunk/samples/netui-jsf/web/WEB-INF/beehive-netui-validator-rules.xml Mon Nov 20 09:10:42 2006
@@ -1,6 +1,26 @@
<!DOCTYPE form-validation PUBLIC
"-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.0//EN"
"http://jakarta.apache.org/commons/dtds/validator_1_0.dtd">
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
+
<!--
This file contains the default NetUI validator definitions. It should be
placed in /WEB-INF, and is automatically referenced in Struts config files
Modified: beehive/trunk/samples/netui-jsf/web/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-jsf/web/WEB-INF/faces-config.xml?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-jsf/web/WEB-INF/faces-config.xml (original)
+++ beehive/trunk/samples/netui-jsf/web/WEB-INF/faces-config.xml Mon Nov 20 09:10:42 2006
@@ -4,6 +4,25 @@
"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
"http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
+
<faces-config>
<application>
Modified: beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.jsf-ri
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.jsf-ri?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.jsf-ri (original)
+++ beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.jsf-ri Mon Nov 20 09:10:42 2006
@@ -1,5 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
+
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
Modified: beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.myfaces
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.myfaces?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.myfaces (original)
+++ beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.myfaces Mon Nov 20 09:10:42 2006
@@ -1,5 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
+
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
Modified: beehive/trunk/samples/netui-samples/src/advanced/dynaforms/merge-struts-config-dynaforms.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/src/advanced/dynaforms/merge-struts-config-dynaforms.xml?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-samples/src/advanced/dynaforms/merge-struts-config-dynaforms.xml (original)
+++ beehive/trunk/samples/netui-samples/src/advanced/dynaforms/merge-struts-config-dynaforms.xml Mon Nov 20 09:10:42 2006
@@ -3,6 +3,25 @@
<!DOCTYPE struts-config PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
<struts-config>
<form-beans>
Modified: beehive/trunk/samples/netui-samples/src/log4j.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/src/log4j.xml?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-samples/src/log4j.xml (original)
+++ beehive/trunk/samples/netui-samples/src/log4j.xml Mon Nov 20 09:10:42 2006
@@ -1,6 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
+
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="BEEHIVE_FILE_LOG" class="org.apache.log4j.RollingFileAppender">
Modified: beehive/trunk/samples/netui-samples/web/WEB-INF/beehive-netui-config.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/WEB-INF/beehive-netui-config.xml?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-samples/web/WEB-INF/beehive-netui-config.xml (original)
+++ beehive/trunk/samples/netui-samples/web/WEB-INF/beehive-netui-config.xml Mon Nov 20 09:10:42 2006
@@ -1,5 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
<netui-config xmlns="http://beehive.apache.org/netui/2004/server/config">
<expression-languages>
Modified: beehive/trunk/samples/netui-samples/web/WEB-INF/beehive-netui-validator-rules.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/WEB-INF/beehive-netui-validator-rules.xml?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-samples/web/WEB-INF/beehive-netui-validator-rules.xml (original)
+++ beehive/trunk/samples/netui-samples/web/WEB-INF/beehive-netui-validator-rules.xml Mon Nov 20 09:10:42 2006
@@ -1,6 +1,26 @@
<!DOCTYPE form-validation PUBLIC
"-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.0//EN"
"http://jakarta.apache.org/commons/dtds/validator_1_0.dtd">
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
+
<!--
This file contains the default NetUI validator definitions. It should be
placed in /WEB-INF, and is automatically referenced in Struts config files
Modified: beehive/trunk/samples/netui-samples/web/WEB-INF/custom-validator-rules.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/WEB-INF/custom-validator-rules.xml?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-samples/web/WEB-INF/custom-validator-rules.xml (original)
+++ beehive/trunk/samples/netui-samples/web/WEB-INF/custom-validator-rules.xml Mon Nov 20 09:10:42 2006
@@ -2,6 +2,25 @@
"-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.0//EN"
"http://jakarta.apache.org/commons/dtds/validator_1_0.dtd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
+
<!-- This is the definitions file for custom Validator rules associated with the "Custom Validator" sample -->
<form-validation>
<global>
Modified: beehive/trunk/samples/netui-samples/web/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/WEB-INF/tiles-defs.xml?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-samples/web/WEB-INF/tiles-defs.xml (original)
+++ beehive/trunk/samples/netui-samples/web/WEB-INF/tiles-defs.xml Mon Nov 20 09:10:42 2006
@@ -4,6 +4,25 @@
"-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
"http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
+
<!-- Tiles definition file for NetUI sample. -->
<tiles-definitions>
Modified: beehive/trunk/samples/netui-samples/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/WEB-INF/web.xml?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-samples/web/WEB-INF/web.xml (original)
+++ beehive/trunk/samples/netui-samples/web/WEB-INF/web.xml Mon Nov 20 09:10:42 2006
@@ -1,5 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
Modified: beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/index.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/index.jsp?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/index.jsp (original)
+++ beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/index.jsp Mon Nov 20 09:10:42 2006
@@ -1,3 +1,21 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
Modified: beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/success.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/success.jsp?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/success.jsp (original)
+++ beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/success.jsp Mon Nov 20 09:10:42 2006
@@ -1,3 +1,21 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
Modified: beehive/trunk/samples/netui-samples/web/advanced/customvalidator/index.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/advanced/customvalidator/index.jsp?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-samples/web/advanced/customvalidator/index.jsp (original)
+++ beehive/trunk/samples/netui-samples/web/advanced/customvalidator/index.jsp Mon Nov 20 09:10:42 2006
@@ -1,3 +1,21 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
Modified: beehive/trunk/samples/netui-samples/web/advanced/customvalidator/success.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/advanced/customvalidator/success.jsp?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-samples/web/advanced/customvalidator/success.jsp (original)
+++ beehive/trunk/samples/netui-samples/web/advanced/customvalidator/success.jsp Mon Nov 20 09:10:42 2006
@@ -1,3 +1,21 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
Modified: beehive/trunk/samples/netui-samples/web/advanced/dynaforms/input.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/advanced/dynaforms/input.jsp?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-samples/web/advanced/dynaforms/input.jsp (original)
+++ beehive/trunk/samples/netui-samples/web/advanced/dynaforms/input.jsp Mon Nov 20 09:10:42 2006
@@ -1,3 +1,21 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
Modified: beehive/trunk/samples/netui-samples/web/advanced/dynaforms/output.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/advanced/dynaforms/output.jsp?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-samples/web/advanced/dynaforms/output.jsp (original)
+++ beehive/trunk/samples/netui-samples/web/advanced/dynaforms/output.jsp Mon Nov 20 09:10:42 2006
@@ -1,3 +1,21 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
Modified: beehive/trunk/samples/netui-samples/web/ui/datagrid/sortandfilter/index.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/ui/datagrid/sortandfilter/index.jsp?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/netui-samples/web/ui/datagrid/sortandfilter/index.jsp (original)
+++ beehive/trunk/samples/netui-samples/web/ui/datagrid/sortandfilter/index.jsp Mon Nov 20 09:10:42 2006
@@ -1,3 +1,21 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netuidata" %>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
Modified: beehive/trunk/samples/system-controls-jdbc/web/demo.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/system-controls-jdbc/web/demo.jsp?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/system-controls-jdbc/web/demo.jsp (original)
+++ beehive/trunk/samples/system-controls-jdbc/web/demo.jsp Mon Nov 20 09:10:42 2006
@@ -1,3 +1,21 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
Modified: beehive/trunk/samples/system-controls-jdbc/web/details.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/system-controls-jdbc/web/details.jsp?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/system-controls-jdbc/web/details.jsp (original)
+++ beehive/trunk/samples/system-controls-jdbc/web/details.jsp Mon Nov 20 09:10:42 2006
@@ -1,3 +1,21 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
Modified: beehive/trunk/samples/system-controls-jdbc/web/index.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/system-controls-jdbc/web/index.jsp?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/system-controls-jdbc/web/index.jsp (original)
+++ beehive/trunk/samples/system-controls-jdbc/web/index.jsp Mon Nov 20 09:10:42 2006
@@ -1,3 +1,21 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
Modified: beehive/trunk/samples/system-controls-jdbc/web/sql.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/system-controls-jdbc/web/sql.jsp?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/samples/system-controls-jdbc/web/sql.jsp (original)
+++ beehive/trunk/samples/system-controls-jdbc/web/sql.jsp Mon Nov 20 09:10:42 2006
@@ -1,3 +1,21 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
Modified: beehive/trunk/system-controls/src/ejb/beehive-ejb-control.pom
URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/src/ejb/beehive-ejb-control.pom?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/system-controls/src/ejb/beehive-ejb-control.pom (original)
+++ beehive/trunk/system-controls/src/ejb/beehive-ejb-control.pom Mon Nov 20 09:10:42 2006
@@ -1,7 +1,25 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
<project>
- <modelVersion>4</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.beehive</groupId>
<artifactId>beehive-control-ejb</artifactId>
<name>beehive-control-ejb</name>
Modified: beehive/trunk/system-controls/src/jdbc/beehive-jdbc-control.pom
URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/src/jdbc/beehive-jdbc-control.pom?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/system-controls/src/jdbc/beehive-jdbc-control.pom (original)
+++ beehive/trunk/system-controls/src/jdbc/beehive-jdbc-control.pom Mon Nov 20 09:10:42 2006
@@ -1,7 +1,25 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
<project>
- <modelVersion>4</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.beehive</groupId>
<artifactId>beehive-control-jdbc</artifactId>
<name>beehive-control-jdbc</name>
Modified: beehive/trunk/system-controls/src/jms/beehive-jms-control.pom
URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/src/jms/beehive-jms-control.pom?view=diff&rev=477258&r1=477257&r2=477258
==============================================================================
--- beehive/trunk/system-controls/src/jms/beehive-jms-control.pom (original)
+++ beehive/trunk/system-controls/src/jms/beehive-jms-control.pom Mon Nov 20 09:10:42 2006
@@ -1,7 +1,25 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
<project>
- <modelVersion>4</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.beehive</groupId>
<artifactId>beehive-control-jms</artifactId>
<name>beehive-control-jms</name>