You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by sa...@apache.org on 2009/01/11 15:40:56 UTC
svn commit: r733478 - in /incubator/click/trunk/examples/click-cayenne: ./
webapp/ webapp/WEB-INF/ webapp/WEB-INF/lib/ webapp/WEB-INF/src/
webapp/WEB-INF/src/click/cayenne/ webapp/WEB-INF/src/click/cayenne/entity/
webapp/WEB-INF/src/click/cayenne/entit...
Author: sabob
Date: Sun Jan 11 06:40:55 2009
New Revision: 733478
URL: http://svn.apache.org/viewvc?rev=733478&view=rev
Log:
migrated click-cayenne to Apache namespace
Modified:
incubator/click/trunk/examples/click-cayenne/build.properties
incubator/click/trunk/examples/click-cayenne/build.xml
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/HRMap.map.xml
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/cayenne.xml
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/click.xml
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/lib/ (props changed)
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/CayenneFormat.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/CayenneInitFilter.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Department.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Person.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Project.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Department.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Person.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Project.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/BorderedPage.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/CayennePage.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentAjaxViewer.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentEditor.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentsViewer.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonAjaxViewer.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonEditor.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonsViewer.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/SourceViewer.java
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/log4j.properties
incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/web.xml
incubator/click/trunk/examples/click-cayenne/webapp/ajax-head-person.htm
incubator/click/trunk/examples/click-cayenne/webapp/ajax-head.htm
incubator/click/trunk/examples/click-cayenne/webapp/border.htm
incubator/click/trunk/examples/click-cayenne/webapp/department-ajax-viewer.htm
incubator/click/trunk/examples/click-cayenne/webapp/department-editor.htm
incubator/click/trunk/examples/click-cayenne/webapp/departments-viewer.htm
incubator/click/trunk/examples/click-cayenne/webapp/index.html
incubator/click/trunk/examples/click-cayenne/webapp/person-ajax-viewer.htm
incubator/click/trunk/examples/click-cayenne/webapp/person-editor.htm
incubator/click/trunk/examples/click-cayenne/webapp/persons-viewer.htm
incubator/click/trunk/examples/click-cayenne/webapp/source-viewer.htm
incubator/click/trunk/examples/click-cayenne/webapp/style.css
Modified: incubator/click/trunk/examples/click-cayenne/build.properties
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/build.properties?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/build.properties (original)
+++ incubator/click/trunk/examples/click-cayenne/build.properties Sun Jan 11 06:40:55 2009
@@ -1,3 +1,31 @@
+# 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.
+
+# Version of the Click JARs
+click.version=2.0.1
+
+# Third party library versions
+ashwood.version=2.0
+cayenne.version=2.0.4
+servlet.api.version=2.4
+hsqldb.version=1.8.0.1
+log4j.version=1.2.15
+oro.version=2.0.8
+
# App Server deployment directory by Ant target 'deploy-webapps'
dir.appserver=C:/java/apache-tomcat-5.5.12/webapps
Modified: incubator/click/trunk/examples/click-cayenne/build.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/build.xml?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/build.xml (original)
+++ incubator/click/trunk/examples/click-cayenne/build.xml Sun Jan 11 06:40:55 2009
@@ -1,20 +1,40 @@
+<?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.
+-->
<project name="click-cayenne" default="help" basedir=".">
<!-- Project Properties -->
<property file="build.properties"/>
<property name="name" value="click-cayenne"/>
- <property name="jar.ashwood" value="ashwood-1.1.jar"/>
- <property name="jar.cayenne" value="cayenne-nodeps-1.2M9.jar"/>
- <property name="jar.click" value="click-0.19.jar"/>
- <property name="jar.click-extras" value="click-extras-0.19.jar"/>
- <property name="jar.hsqldb" value="hsqldb-1.8.0.1.jar"/>
- <property name="jar.log4j" value="log4j-1.2.9.jar"/>
- <property name="jar.oro" value="oro-2.0.8.jar"/>
- <property name="jar.servlet" value="servlet-api-2.4.jar"/>
-
+ <property name="jar.ashwood" value="ashwood-${ashwood.version}.jar"/>
+ <property name="jar.cayenne" value="cayenne-nodeps-${cayenne.version}.jar"/>
+ <property name="jar.click" value="click-${click.version}-incubating.jar"/>
+ <property name="jar.click-extras" value="click-extras-${click.version}-incubating.jar"/>
+ <property name="jar.hsqldb" value="hsqldb-${hsqldb.version}.jar"/>
+ <property name="jar.log4j" value="log4j-${log4j.version}.jar"/>
+ <property name="jar.oro" value="oro-${oro.version}.jar"/>
+ <property name="jar.servlet" value="servlet-api-${servlet.api.version}.jar"/>
+ <property name="repository" value="http://repo1.maven.org"/>
+
<property name="dir.webapp" value="webapp"/>
<property name="dir.weblib" value="${dir.webapp}/WEB-INF/lib"/>
-
+
<path id="classpath">
<pathelement location="lib/${jar.servlet}"/>
<pathelement location="${dir.weblib}/${jar.cayenne}"/>
@@ -22,7 +42,19 @@
<pathelement location="${dir.weblib}/${jar.click-extras}"/>
<pathelement location="${dir.weblib}/${jar.log4j}"/>
</path>
-
+
+ <!-- Macro Definitions -->
+ <macrodef name="downloadMacro">
+ <attribute name="name"/>
+ <attribute name="path"/>
+ <sequential>
+ <get src="${repository}/maven2/@{path}/@{name}"
+ dest="${dir.weblib}/@{name}"
+ verbose="true"
+ usetimestamp="true"/>
+ </sequential>
+ </macrodef>
+
<!-- Tasks -->
<target name="build" description="build web application WAR file" depends="compile">
@@ -61,65 +93,54 @@
</fileset>
</war>
</target>
-
+
<target name="compile" description="compile Java source">
<delete dir="${dir.webapp}/WEB-INF/classes" quiet="false"/>
<mkdir dir="${dir.webapp}/WEB-INF/classes"/>
- <javac srcdir="${dir.webapp}/WEB-INF/src"
- destdir="${dir.webapp}/WEB-INF/classes"
+ <javac srcdir="${dir.webapp}/WEB-INF/src"
+ destdir="${dir.webapp}/WEB-INF/classes"
debug="true">
<classpath refid="classpath"/>
- </javac>
+ </javac>
</target>
-
- <target name="deploy" description="copy WAR files to application server">
+
+ <target name="deploy" description="copy WAR files to application server">
<copy file="deploy/click-cayenne.war" todir="${dir.appserver}" overwrite="true"/>
</target>
-
+
<target name="get-deps" description="download JAR dependencies">
<mkdir dir="${dir.weblib}"/>
- <property name="repository" value="http://www.ibiblio.org/maven"/>
- <get src="${repository}/org.objectstyle.ashwood/jars/${jar.ashwood}" verbose="true"
- dest="${dir.weblib}/${jar.ashwood}"
- usetimestamp="true"/>
- <get src="${repository}/org.objectstyle.cayenne/jars/${jar.cayenne}" verbose="true"
- dest="${dir.weblib}/${jar.cayenne}"
- usetimestamp="true"/>
- <get src="${repository}/hsqldb/jars/${jar.hsqldb}" verbose="true"
- dest="${dir.weblib}/${jar.hsqldb}"
- usetimestamp="true"/>
- <get src="${repository}/log4j/jars/${jar.log4j}" verbose="true"
- dest="${dir.weblib}/${jar.log4j}"
- usetimestamp="true"/>
- <get src="${repository}/oro/jars/${jar.oro}" verbose="true"
- dest="${dir.weblib}/${jar.oro}"
- usetimestamp="true"/>
- <get src="${repository}/javax.servlet/jars/${jar.servlet}" verbose="true"
+ <downloadMacro name="${jar.ashwood}" path="org/objectstyle/ashwood/ashwood/${ashwood.version}"/>
+ <downloadMacro name="${jar.cayenne}" path="org/apache/cayenne/cayenne-nodeps/${cayenne.version}"/>
+ <downloadMacro name="${jar.log4j}" path="log4j/log4j/${log4j.version}"/>
+ <downloadMacro name="${jar.hsqldb}" path="hsqldb/hsqldb/${hsqldb.version}"/>
+ <downloadMacro name="${jar.oro}" path="oro/oro/${oro.version}"/>
+ <get src="${repository}/maven2/javax/servlet/servlet-api/${servlet.api.version}" verbose="true"
dest="lib/${jar.servlet}"
usetimestamp="true"/>
+
</target>
<target name="get-deps-proxy" description="download JAR dependencies via proxy">
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
<antcall target="get-deps"/>
</target>
-
+
<target name="help" description="display the Help message">
<echo message="Click Cayenne demo web application"/>
- <echo message="=================================="/>
- <echo/>
- <echo message="Main targets:"/>
- <echo/>
- <echo message="build build web application WAR file"/>
+ <echo message="=================================="/>
+ <echo/>
+ <echo message="Main targets:"/>
+ <echo/>
+ <echo message="build build web application WAR file"/>
<echo message="compile compile Java code"/>
<echo message="deploy copy WAR file to application server"/>
- <echo message="get-deps download JAR dependencies"/>
- <echo message="get-deps-proxy download JAR dependencies via proxy"/>
- <echo message="help display the Help message"/>
+ <echo message="get-deps download JAR dependencies"/>
+ <echo message="get-deps-proxy download JAR dependencies via proxy"/>
+ <echo message="help display the Help message"/>
<echo/>
<echo/>
- <echo message="Please ensure you have configured build.properties"/>
- <echo/>
- </target>
-
+ <echo message="Please ensure you have configured build.properties"/>
+ <echo/>
+ </target>
</project>
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/HRMap.map.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/HRMap.map.xml?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/HRMap.map.xml (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/HRMap.map.xml Sun Jan 11 06:40:55 2009
@@ -73,13 +73,13 @@
<obj-relationship name="department" source="Project" target="Department" db-relationship-path="department"/>
<obj-relationship name="manager" source="Project" target="Person" db-relationship-path="manager"/>
<obj-relationship name="members" source="Project" target="Person" db-relationship-path="members.person"/>
- <query name="DepartmentSearch" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Department">
+ <query name="DepartmentSearch" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Department">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.GenericSelectQuery.pageSize" value="10"/>
<qualifier><![CDATA[name = $name]]></qualifier>
<ordering><![CDATA[name]]></ordering>
</query>
- <query name="PersonSearch" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Person">
+ <query name="PersonSearch" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Person">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.GenericSelectQuery.pageSize" value="10"/>
<qualifier><![CDATA[fullName = $fullName]]></qualifier>
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/cayenne.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/cayenne.xml?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/cayenne.xml (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/cayenne.xml Sun Jan 11 06:40:55 2009
@@ -3,14 +3,14 @@
<domain name="HRDomain">
<property name="cayenne.DataRowStore.snapshot.size" value="5000"/>
<property name="cayenne.JavaGroupsBridge.mcast.address" value="228.0.0.4"/>
- <property name="cayenne.DataRowStore.EventBridge.factory" value="org.objectstyle.cayenne.event.JavaGroupsBridgeFactory"/>
+ <property name="cayenne.DataRowStore.EventBridge.factory" value="org.apache.cayenne.event.JavaGroupsBridgeFactory"/>
<map name="HRMap" location="HRMap.map.xml"/>
<node name="HRDB"
datasource="HRDB.driver.xml"
- adapter="org.objectstyle.cayenne.dba.hsqldb.HSQLDBAdapter"
- factory="org.objectstyle.cayenne.conf.DriverDataSourceFactory">
+ adapter="org.apache.cayenne.dba.hsqldb.HSQLDBAdapter"
+ factory="org.apache.cayenne.conf.DriverDataSourceFactory">
<map-ref name="HRMap"/>
</node>
</domain>
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/click.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/click.xml?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/click.xml (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/click.xml Sun Jan 11 06:40:55 2009
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
<click-app>
<pages package="click.cayenne.page" automapping="true"/>
Propchange: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jan 11 06:40:55 2009
@@ -1,9 +1,15 @@
-ashwood-1.1.jar
cayenne-nodeps-1.2M9.jar
-click-0.19.jar
-click-extras-0.19.jar
-commons-logging.jar
hsqldb-1.8.0.1.jar
-log4j-1.2.9.jar
+commons-logging.jar
+cayenne-nodeps-2.0.4.jar
+ashwood-1.1.jar
+ashwood-2.0.jar
oro-2.0.8.jar
+click-extras-0.19.jar
+servlet-api-2.4.jar
+log4j-1.2.15.jar
+click-extras-2.0.1-incubating.jar
spring-1.2.6.jar
+log4j-1.2.9.jar
+click-2.0.1-incubating.jar
+click-0.19.jar
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/CayenneFormat.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/CayenneFormat.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/CayenneFormat.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/CayenneFormat.java Sun Jan 11 06:40:55 2009
@@ -1,17 +1,35 @@
+/*
+ * 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.
+ */
package click.cayenne;
import java.util.List;
import java.util.Map;
-import net.sf.click.util.Format;
+import org.apache.click.util.Format;
-import org.objectstyle.cayenne.CayenneRuntimeException;
-import org.objectstyle.cayenne.DataObject;
-import org.objectstyle.cayenne.DataObjectUtils;
-import org.objectstyle.cayenne.access.DataContext;
-import org.objectstyle.cayenne.map.DbAttribute;
-import org.objectstyle.cayenne.map.ObjEntity;
-import org.objectstyle.cayenne.util.Util;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.DataObject;
+import org.apache.cayenne.DataObjectUtils;
+import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.util.Util;
/**
* Provides a Cayenne customised Click <tt>Format</tt> object.
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/CayenneInitFilter.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/CayenneInitFilter.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/CayenneInitFilter.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/CayenneInitFilter.java Sun Jan 11 06:40:55 2009
@@ -1,14 +1,32 @@
+/*
+ * 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.
+ */
package click.cayenne;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
-import org.objectstyle.cayenne.access.DataDomain;
-import org.objectstyle.cayenne.access.DataNode;
-import org.objectstyle.cayenne.access.DbGenerator;
-import org.objectstyle.cayenne.conf.Configuration;
-import org.objectstyle.cayenne.conf.WebApplicationContextFilter;
-import org.objectstyle.cayenne.map.DataMap;
+import org.apache.cayenne.access.DataDomain;
+import org.apache.cayenne.access.DataNode;
+import org.apache.cayenne.access.DbGenerator;
+import org.apache.cayenne.conf.Configuration;
+import org.apache.cayenne.conf.WebApplicationContextFilter;
+import org.apache.cayenne.map.DataMap;
/**
* Provides a customized WebApplicationContextFilter to initialize
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Department.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Department.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Department.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Department.java Sun Jan 11 06:40:55 2009
@@ -1,11 +1,29 @@
+/*
+ * 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.
+ */
package click.cayenne.entity;
import java.util.List;
-import org.objectstyle.cayenne.exp.ExpressionFactory;
-import org.objectstyle.cayenne.query.SelectQuery;
-import org.objectstyle.cayenne.validation.SimpleValidationFailure;
-import org.objectstyle.cayenne.validation.ValidationResult;
+import org.apache.cayenne.exp.ExpressionFactory;
+import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.validation.SimpleValidationFailure;
+import org.apache.cayenne.validation.ValidationResult;
import click.cayenne.entity.auto._Department;
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Person.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Person.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Person.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Person.java Sun Jan 11 06:40:55 2009
@@ -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.
+ */
package click.cayenne.entity;
import click.cayenne.entity.auto._Person;
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Project.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Project.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Project.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/Project.java Sun Jan 11 06:40:55 2009
@@ -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.
+ */
package click.cayenne.entity;
import click.cayenne.entity.auto._Project;
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Department.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Department.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Department.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Department.java Sun Jan 11 06:40:55 2009
@@ -8,7 +8,7 @@
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _Department extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Department extends org.apache.cayenne.CayenneDataObject {
private static final long serialVersionUID = -4737042061328285064L;
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Person.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Person.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Person.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Person.java Sun Jan 11 06:40:55 2009
@@ -8,7 +8,7 @@
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _Person extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Person extends org.apache.cayenne.CayenneDataObject {
private static final long serialVersionUID = -4456863269273520419L;
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Project.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Project.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Project.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/entity/auto/_Project.java Sun Jan 11 06:40:55 2009
@@ -8,7 +8,7 @@
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _Project extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Project extends org.apache.cayenne.CayenneDataObject {
private static final long serialVersionUID = 5214199287275214498L;
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/BorderedPage.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/BorderedPage.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/BorderedPage.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/BorderedPage.java Sun Jan 11 06:40:55 2009
@@ -1,6 +1,24 @@
+/*
+ * 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.
+ */
package click.cayenne.page;
-import net.sf.click.Page;
+import org.apache.click.Page;
/**
* Provides a page border template. This Page returns the template
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/CayennePage.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/CayennePage.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/CayennePage.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/CayennePage.java Sun Jan 11 06:40:55 2009
@@ -1,10 +1,28 @@
+/*
+ * 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.
+ */
package click.cayenne.page;
-import net.sf.click.Page;
+import org.apache.click.Page;
-import org.objectstyle.cayenne.DataObject;
-import org.objectstyle.cayenne.DataObjectUtils;
-import org.objectstyle.cayenne.access.DataContext;
+import org.apache.cayenne.DataObject;
+import org.apache.cayenne.DataObjectUtils;
+import org.apache.cayenne.access.DataContext;
/**
* Provides a base Cayenne page which provides utility methods for retrieving
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentAjaxViewer.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentAjaxViewer.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentAjaxViewer.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentAjaxViewer.java Sun Jan 11 06:40:55 2009
@@ -1,8 +1,26 @@
+/*
+ * 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.
+ */
package click.cayenne.page;
-import net.sf.click.control.ActionLink;
+import org.apache.click.control.ActionLink;
-import org.objectstyle.cayenne.DataObject;
+import org.apache.cayenne.DataObject;
import click.cayenne.entity.Department;
@@ -31,16 +49,16 @@
/**
* Return AJAX response content type of "text/xml".
*
- * @see net.sf.click.Page#getContentType()
+ * @see org.apache.click.Page#getContentType()
*/
public String getContentType() {
- return "text/xml";
+ return "text/xml; charset=UTF-8";
}
/**
* Display the Department AJAX table by rendering a Rico AJAX response.
*
- * @see net.sf.click.Page#onGet()
+ * @see org.apache.click.Page#onGet()
*/
public void onGet() {
String id = getContext().getRequest().getParameter("id");
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentEditor.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentEditor.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentEditor.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentEditor.java Sun Jan 11 06:40:55 2009
@@ -1,10 +1,28 @@
+/*
+ * 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.
+ */
package click.cayenne.page;
import click.cayenne.entity.Department;
-import net.sf.click.control.Submit;
-import net.sf.click.control.TextArea;
-import net.sf.click.control.TextField;
-import net.sf.click.extras.cayenne.CayenneForm;
+import org.apache.click.control.Submit;
+import org.apache.click.control.TextArea;
+import org.apache.click.control.TextField;
+import org.apache.click.extras.cayenne.CayenneForm;
/**
* Provides a Department Editor page which can be used to create or edit
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentsViewer.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentsViewer.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentsViewer.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/DepartmentsViewer.java Sun Jan 11 06:40:55 2009
@@ -1,8 +1,26 @@
+/*
+ * 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.
+ */
package click.cayenne.page;
import java.util.List;
-import net.sf.click.control.ActionLink;
+import org.apache.click.control.ActionLink;
/**
* Provides a Departments viewer page with an ActonLink to create new
@@ -24,7 +42,7 @@
* Perform a configured "DepartmentSearch" and add the results to the pages
* model for display.
*
- * @see net.sf.click.Page#onGet()
+ * @see org.apache.click.Page#onGet()
*/
public void onGet() {
List departmentList =
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonAjaxViewer.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonAjaxViewer.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonAjaxViewer.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonAjaxViewer.java Sun Jan 11 06:40:55 2009
@@ -1,7 +1,25 @@
+/*
+ * 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.
+ */
package click.cayenne.page;
-import org.objectstyle.cayenne.DataObject;
-import net.sf.click.control.ActionLink;
+import org.apache.cayenne.DataObject;
+import org.apache.click.control.ActionLink;
import click.cayenne.entity.Person;
/**
@@ -26,16 +44,16 @@
/**
* Return AJAX response content type of "text/xml".
*
- * @see net.sf.click.Page#getContentType()
+ * @see org.apache.click.Page#getContentType()
*/
public String getContentType() {
- return "text/xml";
+ return "text/xml; charset=UTF-8";
}
/**
* Display the Person AJAX table by rendering a Rico AJAX response.
*
- * @see net.sf.click.Page#onGet()
+ * @see org.apache.click.Page#onGet()
*/
public void onGet() {
String id = getContext().getRequest().getParameter("id");
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonEditor.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonEditor.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonEditor.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonEditor.java Sun Jan 11 06:40:55 2009
@@ -1,13 +1,31 @@
+/*
+ * 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.
+ */
package click.cayenne.page;
-import net.sf.click.control.Submit;
-import net.sf.click.control.TextField;
-import net.sf.click.extras.cayenne.CayenneForm;
-import net.sf.click.extras.cayenne.PropertySelect;
-import net.sf.click.extras.control.DateField;
-import net.sf.click.extras.control.DoubleField;
+import org.apache.click.control.Submit;
+import org.apache.click.control.TextField;
+import org.apache.click.extras.cayenne.CayenneForm;
+import org.apache.click.extras.cayenne.PropertySelect;
+import org.apache.click.extras.control.DateField;
+import org.apache.click.extras.control.DoubleField;
-import org.objectstyle.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.SelectQuery;
import click.cayenne.entity.Department;
import click.cayenne.entity.Person;
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonsViewer.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonsViewer.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonsViewer.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/PersonsViewer.java Sun Jan 11 06:40:55 2009
@@ -1,6 +1,24 @@
+/*
+ * 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.
+ */
package click.cayenne.page;
-import net.sf.click.control.ActionLink;
+import org.apache.click.control.ActionLink;
import java.util.List;
@@ -23,7 +41,7 @@
* Perform a configured "PersonSearch" and add the results to the pages
* model for display.
*
- * @see net.sf.click.Page#onGet()
+ * @see org.apache.click.Page#onGet()
*/
public void onGet() {
List personList =
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/SourceViewer.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/SourceViewer.java?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/SourceViewer.java (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/click/cayenne/page/SourceViewer.java Sun Jan 11 06:40:55 2009
@@ -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.
+ */
package click.cayenne.page;
import java.io.BufferedReader;
@@ -8,8 +26,8 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import net.sf.click.Page;
-import net.sf.click.util.ClickUtils;
+import org.apache.click.Page;
+import org.apache.click.util.ClickUtils;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/log4j.properties?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/log4j.properties (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/src/log4j.properties Sun Jan 11 06:40:55 2009
@@ -1,3 +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.
+
# General Log4J stuff
log4j.rootLogger=WARN, A1
log4j.appender.A1=org.apache.log4j.ConsoleAppender
@@ -5,8 +22,8 @@
log4j.appender.A1.layout.ConversionPattern=[Cayenne] [%-5p] [%t %d{MM-dd HH:mm:ss}] %c{1}: %m%n
# indiv. packages configuration - turning on the packages that we care about
-log4j.logger.org.objectstyle.cayenne = INFO
+log4j.logger.org.apache.cayenne. = INFO
# This is the logger that controls SQL output
# Setting the level to INFO or DEBUG will turn the logs on
-# log4j.logger.org.objectstyle.cayenne.access.QueryLogger = INFO
\ No newline at end of file
+# log4j.logger.org.apache.cayenne.access.QueryLogger = INFO
\ No newline at end of file
Modified: incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/web.xml?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/web.xml (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/WEB-INF/web.xml Sun Jan 11 06:40:55 2009
@@ -1,4 +1,22 @@
<?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.
+-->
<web-app version="2.4" 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
@@ -9,7 +27,7 @@
<!-- Setup Click Servlet -->
<servlet>
<servlet-name>click-servlet</servlet-name>
- <servlet-class>net.sf.click.ClickServlet</servlet-class>
+ <servlet-class>org.apache.click.ClickServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
<servlet-mapping>
Modified: incubator/click/trunk/examples/click-cayenne/webapp/ajax-head-person.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/ajax-head-person.htm?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/ajax-head-person.htm (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/ajax-head-person.htm Sun Jan 11 06:40:55 2009
@@ -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.*#
+-->
<script type='text/javascript' src='prototype.js'></script>
<script type='text/javascript' src='rico.js'></script>
<script type='text/javascript'>
Modified: incubator/click/trunk/examples/click-cayenne/webapp/ajax-head.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/ajax-head.htm?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/ajax-head.htm (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/ajax-head.htm Sun Jan 11 06:40:55 2009
@@ -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.*#
+-->
<script type='text/javascript' src='prototype.js'></script>
<script type='text/javascript' src='rico.js'></script>
<script type='text/javascript'>
Modified: incubator/click/trunk/examples/click-cayenne/webapp/border.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/border.htm?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/border.htm (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/border.htm Sun Jan 11 06:40:55 2009
@@ -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.
+-->
<html>
<head>
<title>Cayenne Click Examples - $title</title>
Modified: incubator/click/trunk/examples/click-cayenne/webapp/department-ajax-viewer.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/department-ajax-viewer.htm?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/department-ajax-viewer.htm (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/department-ajax-viewer.htm Sun Jan 11 06:40:55 2009
@@ -1,3 +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.*#
+-->
+
<ajax-response>
<response type="element" id="departmentDetails">
#if ($department)
Modified: incubator/click/trunk/examples/click-cayenne/webapp/department-editor.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/department-editor.htm?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/department-editor.htm (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/department-editor.htm Sun Jan 11 06:40:55 2009
@@ -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.*#
+-->
+
${form}
\ No newline at end of file
Modified: incubator/click/trunk/examples/click-cayenne/webapp/departments-viewer.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/departments-viewer.htm?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/departments-viewer.htm (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/departments-viewer.htm Sun Jan 11 06:40:55 2009
@@ -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.*#
+-->
+
<p><i><a href="$newLink.href">
<img src="images/icon-plus.gif" alt="New" title="New" border="0" align="middle"/> create new department...</a></i></p>
Modified: incubator/click/trunk/examples/click-cayenne/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/index.html?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/index.html (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/index.html Sun Jan 11 06:40:55 2009
@@ -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.
+-->
<html>
<head>
<title>Cayenne/Click Example</title>
Modified: incubator/click/trunk/examples/click-cayenne/webapp/person-ajax-viewer.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/person-ajax-viewer.htm?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/person-ajax-viewer.htm (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/person-ajax-viewer.htm Sun Jan 11 06:40:55 2009
@@ -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.*#
+-->
+
<ajax-response>
<response type="element" id="personDetails">
#if ($person)
Modified: incubator/click/trunk/examples/click-cayenne/webapp/person-editor.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/person-editor.htm?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/person-editor.htm (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/person-editor.htm Sun Jan 11 06:40:55 2009
@@ -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.*#
+-->
+
${form}
\ No newline at end of file
Modified: incubator/click/trunk/examples/click-cayenne/webapp/persons-viewer.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/persons-viewer.htm?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/persons-viewer.htm (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/persons-viewer.htm Sun Jan 11 06:40:55 2009
@@ -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.*#
+-->
+
<p><i><a href="$newLink.href">
<img src="images/icon-plus.gif" alt="New" title="New" border="0" align="middle"/> create new person...</a></i></p>
Modified: incubator/click/trunk/examples/click-cayenne/webapp/source-viewer.htm
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/source-viewer.htm?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/source-viewer.htm (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/source-viewer.htm Sun Jan 11 06:40:55 2009
@@ -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.*#
+-->
+
#if ($source)
<pre>
$source
Modified: incubator/click/trunk/examples/click-cayenne/webapp/style.css
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-cayenne/webapp/style.css?rev=733478&r1=733477&r2=733478&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-cayenne/webapp/style.css (original)
+++ incubator/click/trunk/examples/click-cayenne/webapp/style.css Sun Jan 11 06:40:55 2009
@@ -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.
+ */
body, table, p {
font-family: verdana, arial, helvetica, lucida-sans, sans-serif;
font-size: 12px;