svn commit: r987317 - in /pivot/trunk: deployment-example.xml examples/src/org/apache/pivot/examples/deployment/DeploymentExample.java

[gb...@apache.org]

Author: gbrown
Date: Thu Aug 19 21:29:47 2010
New Revision: 987317

URL: http://svn.apache.org/viewvc?rev=987317&view=rev
Log:
Eliminate main() method from deployment example application.

Modified:
    pivot/trunk/deployment-example.xml
    pivot/trunk/examples/src/org/apache/pivot/examples/deployment/DeploymentExample.java

Modified: pivot/trunk/deployment-example.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/deployment-example.xml?rev=987317&r1=987316&r2=987317&view=diff
==============================================================================
--- pivot/trunk/deployment-example.xml (original)
+++ pivot/trunk/deployment-example.xml Thu Aug 19 21:29:47 2010
@@ -153,10 +153,12 @@ JarBundler requires Mac OS X. See the pr
             classpath="${launch4j.dir}/launch4j.jar:${launch4j.dir}/lib/xstream.jar"/>
 
         <launch4j>
-            <config headerType="gui" jar="${folder.lib}/${example.jar}"
+            <config headerType="gui"
+                jar="${folder.lib}/${example.jar}"
                 icon="${ant.project.name}/${folder.src}/${example.path}/logo-notext-256x256.ico"
+                cmdLine="org.apache.pivot.examples.deployment.DeploymentExample"
                 outfile="${example.exe}">
-                <classPath mainClass="org.apache.pivot.examples.deployment.DeploymentExample"
+                <classPath mainClass="org.apache.pivot.wtk.DesktopApplicationContext"
                     cp="${folder.lib}/pivot-core-${version}.jar;${folder.lib}/pivot-wtk-${version}.jar;${folder.lib}/pivot-wtk-terra-${version}.jar"/>
                 <jre minVersion="1.6.0"/>
             </config>
@@ -180,7 +182,8 @@ JarBundler requires Mac OS X. See the pr
 
         <jarbundler dir="."
             name="${example.name}"
-            mainclass="org.apache.pivot.examples.deployment.DeploymentExample"
+            mainclass="org.apache.pivot.wtk.DesktopApplicationContext"
+            arguments="org.apache.pivot.examples.deployment.DeploymentExample"
             icon="${ant.project.name}/${folder.src}/${example.path}/logo-notext-256x256.icns">
             <jarfileset dir="${folder.lib}">
                 <include name="${example.jar}"/>

Modified: 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=987317&r1=987316&r2=987317&view=diff
==============================================================================
--- pivot/trunk/examples/src/org/apache/pivot/examples/deployment/DeploymentExample.java (original)
+++ pivot/trunk/examples/src/org/apache/pivot/examples/deployment/DeploymentExample.java Thu Aug 19 21:29:47 2010
@@ -3,7 +3,6 @@ package org.apache.pivot.examples.deploy
 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;
 
@@ -33,8 +32,4 @@ public class DeploymentExample implement
     @Override
     public void resume() {
     }
-
-    public static void main(String[] args) {
-        DesktopApplicationContext.main(DeploymentExample.class, args);
-    }
 }