You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/07/29 21:20:59 UTC
svn commit: r980543 - in /pivot/trunk: demos/
examples/src/org/apache/pivot/examples/deployment/ tutorials/
Author: gbrown
Date: Thu Jul 29 19:20:58 2010
New Revision: 980543
URL: http://svn.apache.org/viewvc?rev=980543&view=rev
Log:
Add simple application that will serve as the basis for the deployment example build script; update web.xml files to version 2.5.
Added:
pivot/trunk/examples/src/org/apache/pivot/examples/deployment/
pivot/trunk/examples/src/org/apache/pivot/examples/deployment/DeploymentExample.java
pivot/trunk/examples/src/org/apache/pivot/examples/deployment/deployment-example.html
pivot/trunk/examples/src/org/apache/pivot/examples/deployment/deployment_example_window.bxml
pivot/trunk/examples/src/org/apache/pivot/examples/deployment/logo-256x256.png (with props)
pivot/trunk/examples/src/org/apache/pivot/examples/deployment/web.xml
Modified:
pivot/trunk/demos/web.xml
pivot/trunk/tutorials/web.xml
Modified: pivot/trunk/demos/web.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/web.xml?rev=980543&r1=980542&r2=980543&view=diff
==============================================================================
--- pivot/trunk/demos/web.xml (original)
+++ pivot/trunk/demos/web.xml Thu Jul 29 19:20:58 2010
@@ -16,10 +16,10 @@ See the License for the specific languag
limitations under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
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"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
<description>Pivot Demos</description>
<display-name>Pivot Demos</display-name>
Added: pivot/trunk/examples/src/org/apache/pivot/examples/deployment/DeploymentExample.java
URL: http://svn.apache.org/viewvc/pivot/trunk/examples/src/org/apache/pivot/examples/deployment/DeploymentExample.java?rev=980543&view=auto
==============================================================================
--- pivot/trunk/examples/src/org/apache/pivot/examples/deployment/DeploymentExample.java (added)
+++ pivot/trunk/examples/src/org/apache/pivot/examples/deployment/DeploymentExample.java Thu Jul 29 19:20:58 2010
@@ -0,0 +1,40 @@
+package org.apache.pivot.examples.deployment;
+
+import org.apache.pivot.beans.BXMLSerializer;
+import org.apache.pivot.collections.Map;
+import org.apache.pivot.wtk.Application;
+import org.apache.pivot.wtk.DesktopApplicationContext;
+import org.apache.pivot.wtk.Display;
+import org.apache.pivot.wtk.Window;
+
+public class DeploymentExample implements Application {
+ private Window window = null;
+
+ @Override
+ public void startup(Display display, Map<String, String> properties) throws Exception {
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(DeploymentExample.class, "deployment_example_window.bxml");
+ window.open(display);
+ }
+
+ @Override
+ public boolean shutdown(boolean optional) {
+ if (window != null) {
+ window.close();
+ }
+
+ return false;
+ }
+
+ @Override
+ public void suspend() {
+ }
+
+ @Override
+ public void resume() {
+ }
+
+ public static void main(String[] args) {
+ DesktopApplicationContext.main(DeploymentExample.class, args);
+ }
+}
Added: pivot/trunk/examples/src/org/apache/pivot/examples/deployment/deployment-example.html
URL: http://svn.apache.org/viewvc/pivot/trunk/examples/src/org/apache/pivot/examples/deployment/deployment-example.html?rev=980543&view=auto
==============================================================================
--- pivot/trunk/examples/src/org/apache/pivot/examples/deployment/deployment-example.html (added)
+++ pivot/trunk/examples/src/org/apache/pivot/examples/deployment/deployment-example.html Thu Jul 29 19:20:58 2010
@@ -0,0 +1,48 @@
+<!--
+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>Pivot Deployment Example</title>
+<style>
+* {
+ padding: 0px;
+ margin: 0px;
+}
+
+html, body {
+ height: 100%;
+ overflow: hidden;
+}
+</style>
+</head>
+<body>
+<script src="http://java.com/js/deployJava.js"></script>
+<script>
+var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
+ archive:"lib/pivot-core-@version@.jar,lib/pivot-wtk-@version@.jar,lib/pivot-wtk-terra-@version@.jar,lib/deployment-example.jar",
+ width:"100%",
+ height:"100%"
+};
+var parameters = {application_class_name:"org.apache.pivot.examples.deployment",
+ codebase_lookup:false
+};
+var version = "1.6";
+deployJava.runApplet(attributes, parameters, version);
+</script>
+</body>
+</html>
Added: pivot/trunk/examples/src/org/apache/pivot/examples/deployment/deployment_example_window.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/examples/src/org/apache/pivot/examples/deployment/deployment_example_window.bxml?rev=980543&view=auto
==============================================================================
--- pivot/trunk/examples/src/org/apache/pivot/examples/deployment/deployment_example_window.bxml (added)
+++ pivot/trunk/examples/src/org/apache/pivot/examples/deployment/deployment_example_window.bxml Thu Jul 29 19:20:58 2010
@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<Window title="Deployment Example" maximized="true"
+ xmlns:bxml="http://pivot.apache.org/bxml"
+ xmlns="org.apache.pivot.wtk">
+ <BoxPane orientation="vertical" styles="{horizontalAlignment:'center', verticalAlignment:'center',
+ spacing:12}">
+ <Label text="Welcome to Apache Pivot!" styles="{font:{size:16}}"/>
+ <ImageView image="@logo-256x256.png"/>
+ </BoxPane>
+</Window>
+
Added: pivot/trunk/examples/src/org/apache/pivot/examples/deployment/logo-256x256.png
URL: http://svn.apache.org/viewvc/pivot/trunk/examples/src/org/apache/pivot/examples/deployment/logo-256x256.png?rev=980543&view=auto
==============================================================================
Binary file - no diff available.
Propchange: pivot/trunk/examples/src/org/apache/pivot/examples/deployment/logo-256x256.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: pivot/trunk/examples/src/org/apache/pivot/examples/deployment/web.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/examples/src/org/apache/pivot/examples/deployment/web.xml?rev=980543&view=auto
==============================================================================
--- pivot/trunk/examples/src/org/apache/pivot/examples/deployment/web.xml (added)
+++ pivot/trunk/examples/src/org/apache/pivot/examples/deployment/web.xml Thu Jul 29 19:20:58 2010
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+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 xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+ <description>Pivot Deployment Example</description>
+ <display-name>Pivot Deployment Example</display-name>
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+</web-app>
Modified: pivot/trunk/tutorials/web.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/web.xml?rev=980543&r1=980542&r2=980543&view=diff
==============================================================================
--- pivot/trunk/tutorials/web.xml (original)
+++ pivot/trunk/tutorials/web.xml Thu Jul 29 19:20:58 2010
@@ -16,10 +16,10 @@ See the License for the specific languag
limitations under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
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"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
<description>Pivot Tutorials</description>
<display-name>Pivot Tutorials</display-name>