You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2012/06/18 23:53:52 UTC
svn commit: r1351504 - in
/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main:
java/org/apache/empire/jsf2/custom/controls/
java/org/apache/empire/jsf2/websample/web/
java/org/apache/empire/jsf2/websample/web/pages/ webapp/resources/com...
Author: doebele
Date: Mon Jun 18 21:53:51 2012
New Revision: 1351504
URL: http://svn.apache.org/viewvc?rev=1351504&view=rev
Log:
EMPIREDB-140
added license headers
Removed:
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/components/control.xhtml
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/components/record.xhtml
Modified:
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/custom/controls/FileInputControl.java
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleApplication.java
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeListPage.java
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/SamplePage.java
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/SamplePages.java
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/control.xhtml
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/input.xhtml
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/label.xhtml
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/link.xhtml
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/record.xhtml
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/title.xhtml
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/value.xhtml
Modified: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/custom/controls/FileInputControl.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/custom/controls/FileInputControl.java?rev=1351504&r1=1351503&r2=1351504&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/custom/controls/FileInputControl.java (original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/custom/controls/FileInputControl.java Mon Jun 18 21:53:51 2012
@@ -78,16 +78,13 @@ public class FileInputControl extends In
public class HtmlInputFile extends HtmlInputText
{
-
- public static final String COMPONENT_TYPE = "HtmlFileInput";
- public static final String RENDER_TYPE = "org.apache.empire.jsf2.custom.controls.FileInputRenderer";
+ public static final String RENDER_TYPE = "org.apache.empire.jsf2.custom.controls.FileInputRenderer";
@Override
public String getRendererType()
{
return RENDER_TYPE;
}
-
}
public class FileInputRenderer extends TextRenderer
Modified: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleApplication.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleApplication.java?rev=1351504&r1=1351503&r2=1351504&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleApplication.java (original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleApplication.java Mon Jun 18 21:53:51 2012
@@ -293,6 +293,7 @@ public class SampleApplication extends F
* As the sample does not use connection pooling, a static connection is returned
* @return a connection for the requested db
*/
+ @Override
protected Connection getConnection(DBDatabase db)
{
return conn;
@@ -302,6 +303,7 @@ public class SampleApplication extends F
* Usually releases a connection from the connection pool
* As the sample does not use connection pooling, only a commit or rollback is performed
*/
+ @Override
protected void releaseConnection(DBDatabase db, Connection conn, boolean commit)
{
// release connection
Modified: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeListPage.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeListPage.java?rev=1351504&r1=1351503&r2=1351504&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeListPage.java (original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeListPage.java Mon Jun 18 21:53:51 2012
@@ -215,7 +215,7 @@ public class EmployeeListPage extends Sa
if (ObjectUtils.isEmpty(value))
return;
// is it an array
- if (value instanceof Collection || value.getClass().isArray())
+ if (value instanceof Collection<?> || value.getClass().isArray())
{
cmd.where(col.in(value));
return;
Modified: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/SamplePage.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/SamplePage.java?rev=1351504&r1=1351503&r2=1351504&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/SamplePage.java (original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/SamplePage.java Mon Jun 18 21:53:51 2012
@@ -1,5 +1,20 @@
/*
- * ESTEAM Software GmbH, 18.04.2012
+ * 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 org.apache.empire.jsf2.websample.web.pages;
Modified: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/SamplePages.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/SamplePages.java?rev=1351504&r1=1351503&r2=1351504&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/SamplePages.java (original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/SamplePages.java Mon Jun 18 21:53:51 2012
@@ -1,5 +1,20 @@
/*
- * ESTEAM Software GmbH, 18.04.2012
+ * 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 org.apache.empire.jsf2.websample.web.pages;
Modified: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/control.xhtml
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/control.xhtml?rev=1351504&r1=1351503&r2=1351504&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/control.xhtml (original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/control.xhtml Mon Jun 18 21:53:51 2012
@@ -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 xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jsp/jstl/core"
Modified: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/input.xhtml
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/input.xhtml?rev=1351504&r1=1351503&r2=1351504&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/input.xhtml (original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/input.xhtml Mon Jun 18 21:53:51 2012
@@ -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 xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jsp/jstl/core"
Modified: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/label.xhtml
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/label.xhtml?rev=1351504&r1=1351503&r2=1351504&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/label.xhtml (original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/label.xhtml Mon Jun 18 21:53:51 2012
@@ -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 xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jsp/jstl/core"
Modified: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/link.xhtml
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/link.xhtml?rev=1351504&r1=1351503&r2=1351504&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/link.xhtml (original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/link.xhtml Mon Jun 18 21:53:51 2012
@@ -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 xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jsp/jstl/core"
Modified: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/record.xhtml
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/record.xhtml?rev=1351504&r1=1351503&r2=1351504&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/record.xhtml (original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/record.xhtml Mon Jun 18 21:53:51 2012
@@ -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 xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jsp/jstl/core"
Modified: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/title.xhtml
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/title.xhtml?rev=1351504&r1=1351503&r2=1351504&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/title.xhtml (original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/title.xhtml Mon Jun 18 21:53:51 2012
@@ -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 xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jsp/jstl/core"
Modified: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/value.xhtml
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/value.xhtml?rev=1351504&r1=1351503&r2=1351504&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/value.xhtml (original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/empire/value.xhtml Mon Jun 18 21:53:51 2012
@@ -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 xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jsp/jstl/core"