Author: clopes
Date: 2011-07-08 11:57:48 -0700 (Fri, 08 Jul 2011)
New Revision: 26121

Added:
   csplugins/trunk/soc/komal/ExportToCWPlugin/default.properties
   csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/resources/org/
   csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/resources/org/cytoscape/
   
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/resources/org/cytoscape/komal/
   
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/resources/org/cytoscape/komal/plugin.props
Modified:
   csplugins/trunk/soc/komal/ExportToCWPlugin/
   csplugins/trunk/soc/komal/ExportToCWPlugin/build.xml
   csplugins/trunk/soc/komal/ExportToCWPlugin/pom.xml
   
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/CopyDir.java
   
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/ExportToCWPlugin.java
   
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/FileChooserDemo.java
   
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/GetCurrentDir.java
   
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/Main.java
   
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/OpenBrowser.java
   
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/SwingFileChooserDemo.java
   
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/WebPage.java
   
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/htmlpage.java
Log:
Fixed package declarations and added required plugin files.


Property changes on: csplugins/trunk/soc/komal/ExportToCWPlugin
___________________________________________________________________
Added: svn:ignore
   + local.properties
.settings
.classpath
.project


Modified: csplugins/trunk/soc/komal/ExportToCWPlugin/build.xml
===================================================================
--- csplugins/trunk/soc/komal/ExportToCWPlugin/build.xml        2011-07-08 
18:47:50 UTC (rev 26120)
+++ csplugins/trunk/soc/komal/ExportToCWPlugin/build.xml        2011-07-08 
18:57:48 UTC (rev 26121)
@@ -1,74 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="ExportToCWPlugin" default="default" basedir=".">
-    <description>Builds, tests, and runs the project 
ExportToCWPlugin.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project 
properties
-      -post-init:                called after initialization of project 
properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single 
JUnit test
-      -post-compile-test-single: called after javac compilation of single 
JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like 
this:
-
-        <target name="run" depends="ExportToCWPlugin-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only 
on 
-    the compile target as the regular run target does. Again, for a list of 
available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-</project>
+<?xml version="1.0"?>
+<project name="Cytoscape Web Export" basedir="." default="install">
+    
+    <!-- 
+         This file should be created by each user when he/she needs to 
override particular values. 
+         Do NOT place it under version control.
+    -->
+    <property file="local.properties"/>
+    
+    <property file="default.properties"/>
+    
+    <property environment="env"/>
+    
+    <property name="build.dir" value="target"/>
+    <property name="cytoscape.plugin.dir" value="${cytoscape.home}/plugins"/>
+
+    <target name="install">
+        <copy todir="${cytoscape.plugin.dir}" overwrite="true">
+            <fileset dir="${build.dir}" includes="*.jar"/>
+        </copy>
+    </target>
+    
+    <target name="info">
+        
<echo>*******************************************************************</echo>
+        <echo>*   This script installs the Cytoscape plugin                    
 *</echo>
+        
<echo>*******************************************************************</echo>
+    </target>
+    
+</project>
\ No newline at end of file

Added: csplugins/trunk/soc/komal/ExportToCWPlugin/default.properties
===================================================================
--- csplugins/trunk/soc/komal/ExportToCWPlugin/default.properties               
                (rev 0)
+++ csplugins/trunk/soc/komal/ExportToCWPlugin/default.properties       
2011-07-08 18:57:48 UTC (rev 26121)
@@ -0,0 +1,2 @@
+# Overwrite it in your local.properties file
+cytoscape.home=/Applications/Cytoscape_v2.8.1
\ No newline at end of file

Modified: csplugins/trunk/soc/komal/ExportToCWPlugin/pom.xml
===================================================================
--- csplugins/trunk/soc/komal/ExportToCWPlugin/pom.xml  2011-07-08 18:47:50 UTC 
(rev 26120)
+++ csplugins/trunk/soc/komal/ExportToCWPlugin/pom.xml  2011-07-08 18:57:48 UTC 
(rev 26121)
@@ -6,7 +6,6 @@
        <groupId>org.cytoscape</groupId>
        <artifactId>cytoscapeweb-export</artifactId>
        <version>0.1-SNAPSHOT</version>
-       <packaging>maven-archetype</packaging>
        <name>Cytoscape Web Export Plugin</name>
 
        <build>
@@ -20,52 +19,6 @@
                <plugins>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-archetype-plugin</artifactId>
-                               <version>2.0-alpha-5</version>
-                               <extensions>true</extensions>
-                       </plugin>
-                       <!--
-                               The point of this code is to use the archetype 
we just created and
-                               use it to generate a project and then build the 
project, which will
-                               test that our archetype still works.
-                       -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-invoker-plugin</artifactId>
-                               <version>1.5</version>
-                               <executions>
-                                       <execution>
-                                               <id>integration-test</id>
-                                               <goals>
-                                                       <goal>install</goal>
-                                                       <goal>run</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <configuration>
-                                       
<cloneProjectsTo>${project.build.directory}/it/projects</cloneProjectsTo>
-                                       <goals>
-                                               
<goal>org.apache.maven.plugins:maven-archetype-plugin:generate</goal>
-                                       </goals>
-                                       
<localRepositoryPath>${project.build.directory}/it/repo</localRepositoryPath>
-                                       <pomIncludes>
-                                               <pomInclude>*</pomInclude>
-                                       </pomIncludes>
-                                       
<projectsDirectory>${basedir}/src/it/projects</projectsDirectory>
-                                       
<postBuildHookScript>verify.bsh</postBuildHookScript>
-                                       <properties>
-                                               
<archetypeArtifactId>${project.artifactId}</archetypeArtifactId>
-                                               
<archetypeGroupId>${project.groupId}</archetypeGroupId>
-                                               
<archetypeRepository>local</archetypeRepository>
-                                               
<archetypeVersion>${project.version}</archetypeVersion>
-                                               <goals>verify</goals>
-                                               
<interactiveMode>false</interactiveMode>
-                                       </properties>
-                                       <streamLogs>true</streamLogs>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-clean-plugin</artifactId>
                                <version>2.4.1</version>
                                <executions>
@@ -78,6 +31,17 @@
                                        </execution>
                                </executions>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-jar-plugin</artifactId>
+                               <configuration>
+                                       <archive>
+                                               <manifestEntries>
+                                                       
<Cytoscape-Plugin>org.cytoscape.komal.ExportToCWPlugin</Cytoscape-Plugin>
+                                               </manifestEntries>
+                                       </archive>
+                               </configuration>
+                       </plugin>
                </plugins>
        </build>
 

Modified: 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/CopyDir.java
===================================================================
--- 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/CopyDir.java
   2011-07-08 18:47:50 UTC (rev 26120)
+++ 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/CopyDir.java
   2011-07-08 18:57:48 UTC (rev 26121)
@@ -1,4 +1,4 @@
-package main.java.org.cytoscape.komal;
+package org.cytoscape.komal;
 
 
 import java.io.File;

Modified: 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/ExportToCWPlugin.java
===================================================================
--- 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/ExportToCWPlugin.java
  2011-07-08 18:47:50 UTC (rev 26120)
+++ 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/ExportToCWPlugin.java
  2011-07-08 18:57:48 UTC (rev 26121)
@@ -1,4 +1,4 @@
-package main.java.org.cytoscape.komal;
+package org.cytoscape.komal;
 
 import cytoscape.CyNetwork;
 import cytoscape.Cytoscape;

Modified: 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/FileChooserDemo.java
===================================================================
--- 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/FileChooserDemo.java
   2011-07-08 18:47:50 UTC (rev 26120)
+++ 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/FileChooserDemo.java
   2011-07-08 18:57:48 UTC (rev 26121)
@@ -1,5 +1,5 @@
 
-package exportasxgmmltrial;
+package org.cytoscape.komal;
 
 import java.io.*;
 import java.awt.*;

Modified: 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/GetCurrentDir.java
===================================================================
--- 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/GetCurrentDir.java
     2011-07-08 18:47:50 UTC (rev 26120)
+++ 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/GetCurrentDir.java
     2011-07-08 18:57:48 UTC (rev 26121)
@@ -1,4 +1,4 @@
-package main.java.org.cytoscape.komal;
+package org.cytoscape.komal;
 
 import java.io.*;
 

Modified: 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/Main.java
===================================================================
--- 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/Main.java
      2011-07-08 18:47:50 UTC (rev 26120)
+++ 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/Main.java
      2011-07-08 18:57:48 UTC (rev 26121)
@@ -1,4 +1,4 @@
-package exportasxgmmltrial;
+package org.cytoscape.komal;
 
 import java.net.*;
 import java.net.URL;

Modified: 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/OpenBrowser.java
===================================================================
--- 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/OpenBrowser.java
       2011-07-08 18:47:50 UTC (rev 26120)
+++ 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/OpenBrowser.java
       2011-07-08 18:57:48 UTC (rev 26121)
@@ -1,4 +1,4 @@
-package main.java.org.cytoscape.komal;
+package org.cytoscape.komal;
 
 import java.net.URI;
 import java.awt.Desktop;

Modified: 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/SwingFileChooserDemo.java
===================================================================
--- 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/SwingFileChooserDemo.java
      2011-07-08 18:47:50 UTC (rev 26120)
+++ 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/SwingFileChooserDemo.java
      2011-07-08 18:57:48 UTC (rev 26121)
@@ -3,7 +3,7 @@
  * and open the template in the editor.
  */
 
-package exportasxgmmltrial;
+package org.cytoscape.komal;
 
 import java.awt.BorderLayout;
 import java.awt.Insets;

Modified: 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/WebPage.java
===================================================================
--- 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/WebPage.java
   2011-07-08 18:47:50 UTC (rev 26120)
+++ 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/WebPage.java
   2011-07-08 18:57:48 UTC (rev 26121)
@@ -1,4 +1,4 @@
-package main.java.org.cytoscape.komal;
+package org.cytoscape.komal;
 
 
 import java.io.*;

Modified: 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/htmlpage.java
===================================================================
--- 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/htmlpage.java
  2011-07-08 18:47:50 UTC (rev 26120)
+++ 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/java/org/cytoscape/komal/htmlpage.java
  2011-07-08 18:57:48 UTC (rev 26121)
@@ -1,4 +1,4 @@
-package main.java.org.cytoscape.komal;
+package org.cytoscape.komal;
 
 import java.io.*;
 import java.lang.*;

Added: 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/resources/org/cytoscape/komal/plugin.props
===================================================================
--- 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/resources/org/cytoscape/komal/plugin.props
                              (rev 0)
+++ 
csplugins/trunk/soc/komal/ExportToCWPlugin/src/main/resources/org/cytoscape/komal/plugin.props
      2011-07-08 18:57:48 UTC (rev 26121)
@@ -0,0 +1,39 @@
+#plugin.props
+
+# This props file should be filled out and included in the plugin jar file.  
This props file will be used
+# to put information into the Plugin Manager about the plugin
+
+# -- The following properties are REQUIRED -- #
+
+# The plugin name that will be displayed to users, white space within name is 
not allowed
+pluginName=ExportToCWPlugin
+
+# Description used to give users information about the plugin such as what it 
does.
+# Html tags are encouraged for formatting purposes.
+pluginDescription=Plugin for exporting networks as a Cytoscape Web application.
+
+# Plugin version number, this must be two numbers separated by a decimlal.  
Ex. 0.2, 14.03
+pluginVersion=0.1
+
+# Compatible Cytoscape version. If there are more than one version, seperate 
by ",".
+cytoscapeVersion=2.8
+
+# Category, use one of the categories listed on the 
http://cytoscape.org/plugins2.php site
+pluginCategory=Other
+
+# -- The following properties are OPTIONAL -- #
+
+# URL to a website that gives more information about your plugin, Ex. 
http://my-lab-site.org
+projectURL=http://pinscher.ucsf.edu/cgi-bin/wikigsoc.pl#Heading28
+
+# List of authors.  Note each author and institution pair are separated by a : 
(colon)
+# each additional author institution pair must be separated from other pairs 
bye a ; (semicolon)
+# e.g.
+# pluginAuthorsInstitutions=Sarah and Victor:ISB;Mike, Kei and Peng:UCSD
+pluginAuthorsInstitutions=Komal:GSoC
+
+# Date this plugin/plugin version was released
+releaseDate=May 1, 2011
+
+# If this plugin is never meant to be downloaded except as part of a plugin 
(not common) add this property.  Default is "no"
+themeOnly=no
\ No newline at end of file

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.

Reply via email to