modified package domain to com.usopla.honeyant.*

monzou · Dec 25, 2012 · ffb4e85 · ffb4e85
1 parent 1267df6
commit ffb4e85
Show file tree

Hide file tree

Showing 32 changed files with 174 additions and 152 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-*.class
+*.class
+bin/*
diff --git a/honeyant-example/.honeyant/Person.java.cache b/honeyant-example/.honeyant/Person.java.cache
@@ -1,4 +1,4 @@
-#Person.java.cache
-#Thu Dec 13 17:09:16 JST 2012
-generated=1355385652777
-digest=1560819305
+#Person.java.cache
+#Wed Dec 26 00:57:27 JST 2012
+generated=1356451047085
+digest=788950997
diff --git a/honeyant-example/.project b/honeyant-example/.project
@@ -1,23 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>honeyant-example</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>monzou.honeyant.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>monzou.honeyant.nature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>honeyant-example</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>monzou.honeyant.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.usopla.honeyant.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>monzou.honeyant.nature</nature>
+		<nature>com.usopla.honeyant.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/honeyant-example/.settings/com.usopla.honeyant.prefs b/honeyant-example/.settings/com.usopla.honeyant.prefs
@@ -0,0 +1,8 @@
+com.usopla.honeyant.honeyant-example.buildFileName=honeyant.xml
+com.usopla.honeyant.honeyant-example.buildTarget=honeyant
+com.usopla.honeyant.honeyant-example.buildTriggerAnnotation=HoneyAnt
+com.usopla.honeyant.honeyant-example.cacheEnabled=true
+com.usopla.honeyant.honeyant-example.cacheFileDir=.honeyant
+com.usopla.honeyant.honeyant-example.incrementalBuildEnabled=true
+com.usopla.honeyant.honeyant-example.pluginEnabled=true
+eclipse.preferences.version=1
diff --git a/honeyant-example/honeyant.xml b/honeyant-example/honeyant.xml
@@ -8,7 +8,7 @@
 		</fileset>
 	</path>
 
-	<taskdef name="dump" classname="monzou.honeyant.example.task.DumpTask" classpathref="classpath" />
+	<taskdef name="dump" classname="com.usopla.honeyant.example.task.DumpTask" classpathref="classpath" />
 
 	<target name="honeyant" description="HoneyAnt incremental build task example">
 		<echo message="HoneyAnt incremental build: ${clazz} (${path})" />

diff --git a/...honeyant/example/annotation/HoneyAnt.java → ...honeyant/example/annotation/HoneyAnt.java b/...honeyant/example/annotation/HoneyAnt.java → ...honeyant/example/annotation/HoneyAnt.java
@@ -1,4 +1,4 @@
-package monzou.honeyant.example.annotation;
+package com.usopla.honeyant.example.annotation;
 
 /**
  * HoneyAnt marker annotation

diff --git a/honeyant-example/src/main/java/com/usopla/honeyant/example/source/Person.java b/honeyant-example/src/main/java/com/usopla/honeyant/example/source/Person.java
@@ -0,0 +1,17 @@
+package com.usopla.honeyant.example.source;
+
+import com.usopla.honeyant.example.annotation.HoneyAnt;
+
+/**
+ * Person
+ * 
+ * @author monzou
+ */
+@HoneyAnt
+public class Person {
+
+    String name;
+
+    int age;
+
+}
diff --git a/...onzou/honeyant/example/task/DumpTask.java → ...sopla/honeyant/example/task/DumpTask.java b/...onzou/honeyant/example/task/DumpTask.java → ...sopla/honeyant/example/task/DumpTask.java
@@ -1,4 +1,4 @@
-package monzou.honeyant.example.task;
+package com.usopla.honeyant.example.task;
 
 import java.io.BufferedWriter;
 import java.io.File;

diff --git a/honeyant-example/src/main/java/monzou/honeyant/example/source/Person.java b/honeyant-example/src/main/java/monzou/honeyant/example/source/Person.java
diff --git a/honeyant-feature-updatesite/artifacts.jar b/honeyant-feature-updatesite/artifacts.jar
diff --git a/honeyant-feature-updatesite/content.jar b/honeyant-feature-updatesite/content.jar
diff --git a/honeyant-feature-updatesite/features/com.usopla.honeyant.feature_1.0.0.201212260053.jar b/honeyant-feature-updatesite/features/com.usopla.honeyant.feature_1.0.0.201212260053.jar
diff --git a/honeyant-feature-updatesite/features/monzou.honeyant.feature_1.0.0.201212131614.jar b/honeyant-feature-updatesite/features/monzou.honeyant.feature_1.0.0.201212131614.jar
diff --git a/honeyant-feature-updatesite/plugins/com.usopla.honeyant_1.0.0.201212260053.jar b/honeyant-feature-updatesite/plugins/com.usopla.honeyant_1.0.0.201212260053.jar
diff --git a/honeyant-feature-updatesite/plugins/monzou.honeyant_1.0.0.201212131614.jar b/honeyant-feature-updatesite/plugins/monzou.honeyant_1.0.0.201212131614.jar
diff --git a/honeyant-feature-updatesite/site.xml b/honeyant-feature-updatesite/site.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <description name="HoneyAnt Eclipse Plugin Updatesite" url="https://github.com/monzou/honeyant/tree/master/honeyant-feature-updatesite">
-      The updatesite of HoneyAnt Eclipse Plugin.
-   </description>
-   <feature url="features/monzou.honeyant.feature_1.0.0.201212131614.jar" id="monzou.honeyant.feature" version="1.0.0.201212131614">
-      <category name="honeyant"/>
-   </feature>
-   <category-def name="honeyant" label="HoneyAnt">
-      <description>
-         HoneyAnt Eclipse Plugin.
-      </description>
-   </category-def>
-</site>
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <description name="HoneyAnt Eclipse Plugin Updatesite" url="https://github.com/monzou/honeyant/tree/master/honeyant-feature-updatesite">
+      The updatesite of HoneyAnt Eclipse Plugin.
+   </description>
+   <feature url="features/com.usopla.honeyant.feature_1.0.0.201212260053.jar" id="com.usopla.honeyant.feature" version="1.0.0.201212260053">
+      <category name="honeyant"/>
+   </feature>
+   <category-def name="honeyant" label="HoneyAnt">
+      <description>
+         HoneyAnt Eclipse Plugin.
+      </description>
+   </category-def>
+</site>
diff --git a/honeyant-feature/feature.xml b/honeyant-feature/feature.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="monzou.honeyant.feature"
-      label="HoneyAnt Feature"
-      version="1.0.0.qualifier">
-
-   <description url="https://github.com/monzou/honeyant">
-      HoneyAnt Eclipse Plugin.
-   </description>
-
-   <copyright>
-      Copyright (c) 2012 Takuro MONJI
-   </copyright>
-
-   <license url="">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.usopla.honeyant.feature"
+      label="HoneyAnt Feature"
+      version="1.0.0.qualifier">
+
+   <description url="https://github.com/monzou/honeyant">
+      HoneyAnt Eclipse Plugin.
+   </description>
+
+   <copyright>
+      Copyright (c) 2012 Takuro MONJI
+   </copyright>
+
+   <license url="">
       MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 
@@ -31,14 +31,14 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-   </license>
-
-   <plugin
-         id="monzou.honeyant"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+   </license>
+
+   <plugin
+         id="com.usopla.honeyant"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/honeyant-plugin/META-INF/MANIFEST.MF b/honeyant-plugin/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HoneyAnt
-Bundle-SymbolicName: monzou.honeyant;singleton:=true
+Bundle-SymbolicName: com.usopla.honeyant;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: monzou.honeyant.HoneyAnt
+Bundle-Activator: com.usopla.honeyant.HoneyAnt
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.databinding.property;bundle-version="1.4.100",

diff --git a/honeyant-plugin/plugin.xml b/honeyant-plugin/plugin.xml
@@ -3,33 +3,33 @@
 <plugin>
 
    <extension
-         id="monzou.honeyant.nature"
+         id="com.usopla.honeyant.nature"
          name="HoneyAnt Nature"
          point="org.eclipse.core.resources.natures">
       <runtime>
-         <run class="monzou.honeyant.HoneyAntNature" />
+         <run class="com.usopla.honeyant.HoneyAntNature" />
       </runtime>
       <requires-nature id="org.eclipse.jdt.core.javanature" />
    </extension>
    <extension
-         id="monzou.honeyant.preferences.propertyPage"
+         id="com.usopla.honeyant.preferences.propertyPage"
          name="HoneyAnt Property Page"
          point="org.eclipse.ui.propertyPages">
       <page
-            class="monzou.honeyant.preferences.view.HoneyAntPropertyPage"
-            id="monzou.honeyant.preferences.view.propertyPage"
+            class="com.usopla.honeyant.preferences.view.HoneyAntPropertyPage"
+            id="com.usopla.honeyant.preferences.view.propertyPage"
             name="HoneyAnt">
 	    <enabledWhen>
 	      <instanceof value="org.eclipse.jdt.core.IJavaProject" />
 	    </enabledWhen>
       </page>
    </extension>
    <extension
-         id="monzou.honeyant.builder"
+         id="com.usopla.honeyant.builder"
          name="HoneyAnt Runner"
          point="org.eclipse.core.resources.builders">
       <builder>
-         <run class="monzou.honeyant.HoneyAntRunner" />
+         <run class="com.usopla.honeyant.HoneyAntRunner" />
       </builder>
    </extension>
 

diff --git a/...c/main/java/monzou/honeyant/HoneyAnt.java → ...in/java/com/usopla/honeyant/HoneyAnt.java b/...c/main/java/monzou/honeyant/HoneyAnt.java → ...in/java/com/usopla/honeyant/HoneyAnt.java
@@ -1,4 +1,4 @@
-package monzou.honeyant;
+package com.usopla.honeyant;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;

diff --git a/.../monzou/honeyant/HoneyAntBuildLogger.java → .../usopla/honeyant/HoneyAntBuildLogger.java b/.../monzou/honeyant/HoneyAntBuildLogger.java → .../usopla/honeyant/HoneyAntBuildLogger.java
@@ -1,11 +1,8 @@
-package monzou.honeyant;
+package com.usopla.honeyant;
 
 import java.io.IOException;
 import java.io.PrintStream;
 
-import monzou.honeyant.support.Constants;
-import monzou.honeyant.support.Logger;
-import monzou.honeyant.support.LoggerFactory;
 
 import org.apache.tools.ant.DefaultLogger;
 import org.eclipse.ui.console.ConsolePlugin;
@@ -14,6 +11,10 @@
 import org.eclipse.ui.console.IOConsole;
 import org.eclipse.ui.console.IOConsoleOutputStream;
 
+import com.usopla.honeyant.support.Constants;
+import com.usopla.honeyant.support.Logger;
+import com.usopla.honeyant.support.LoggerFactory;
+
 /**
  * HoneyAntBuildLogger
  * 

diff --git a/.../java/monzou/honeyant/HoneyAntNature.java → ...a/com/usopla/honeyant/HoneyAntNature.java b/.../java/monzou/honeyant/HoneyAntNature.java → ...a/com/usopla/honeyant/HoneyAntNature.java
@@ -1,14 +1,15 @@
-package monzou.honeyant;
+package com.usopla.honeyant;
 
-import monzou.honeyant.support.Constants;
-import monzou.honeyant.support.Logger;
-import monzou.honeyant.support.LoggerFactory;
-import monzou.honeyant.support.PluginUtils;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectNature;
 import org.eclipse.core.runtime.CoreException;
 
+import com.usopla.honeyant.support.Constants;
+import com.usopla.honeyant.support.Logger;
+import com.usopla.honeyant.support.LoggerFactory;
+import com.usopla.honeyant.support.PluginUtils;
+
 /**
  * HoneyAntNature
  * 

diff --git a/.../java/monzou/honeyant/HoneyAntRunner.java → ...a/com/usopla/honeyant/HoneyAntRunner.java b/.../java/monzou/honeyant/HoneyAntRunner.java → ...a/com/usopla/honeyant/HoneyAntRunner.java
@@ -1,4 +1,4 @@
-package monzou.honeyant;
+package com.usopla.honeyant;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -18,13 +18,6 @@
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReference;
 
-import monzou.honeyant.preferences.model.HoneyAntPreferences;
-import monzou.honeyant.support.Constants;
-import monzou.honeyant.support.Logger;
-import monzou.honeyant.support.LoggerFactory;
-import monzou.honeyant.support.PluginUtils;
-import monzou.honeyant.support.PreferenceModelFactory;
-import monzou.honeyant.support.Utils;
 
 import org.eclipse.ant.core.AntCorePlugin;
 import org.eclipse.ant.core.AntCorePreferences;
@@ -47,6 +40,14 @@
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaCore;
 
+import com.usopla.honeyant.preferences.model.HoneyAntPreferences;
+import com.usopla.honeyant.support.Constants;
+import com.usopla.honeyant.support.Logger;
+import com.usopla.honeyant.support.LoggerFactory;
+import com.usopla.honeyant.support.PluginUtils;
+import com.usopla.honeyant.support.PreferenceModelFactory;
+import com.usopla.honeyant.support.Utils;
+
 /**
  * HoneyAntRunner
  * 

diff --git a/...references/model/HoneyAntPreferences.java → ...references/model/HoneyAntPreferences.java b/...references/model/HoneyAntPreferences.java → ...references/model/HoneyAntPreferences.java
@@ -1,4 +1,4 @@
-package monzou.honeyant.preferences.model;
+package com.usopla.honeyant.preferences.model;
 
 /**
  * HoneyAntPreferences

diff --git a/...references/view/HoneyAntPropertyPage.java → ...references/view/HoneyAntPropertyPage.java b/...references/view/HoneyAntPropertyPage.java → ...references/view/HoneyAntPropertyPage.java
@@ -1,11 +1,5 @@
-package monzou.honeyant.preferences.view;
+package com.usopla.honeyant.preferences.view;
 
-import monzou.honeyant.preferences.model.HoneyAntPreferences;
-import monzou.honeyant.support.Constants;
-import monzou.honeyant.support.Logger;
-import monzou.honeyant.support.LoggerFactory;
-import monzou.honeyant.support.PluginUtils;
-import monzou.honeyant.support.PreferenceModelFactory;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
@@ -23,6 +17,13 @@
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.PropertyPage;
 
+import com.usopla.honeyant.preferences.model.HoneyAntPreferences;
+import com.usopla.honeyant.support.Constants;
+import com.usopla.honeyant.support.Logger;
+import com.usopla.honeyant.support.LoggerFactory;
+import com.usopla.honeyant.support.PluginUtils;
+import com.usopla.honeyant.support.PreferenceModelFactory;
+
 /**
  * HoneyAntPropertyPage
  *
-Original file line number
+Diff line change
@@ -1 +1,2 @@
-    *.class
+    *.class
+    bin/*