[Yanel-commits] rev 44403 - in public/yanel/contributions/resources/world-time: . src/build src/java/org/wyona/yanel/impl/resources/example

[michi at wyona.com]

Author: michi
Date: 2009-08-26 14:39:51 +0200 (Wed, 26 Aug 2009)
New Revision: 44403

Modified:
   public/yanel/contributions/resources/world-time/build.xml
   public/yanel/contributions/resources/world-time/resource.xml
   public/yanel/contributions/resources/world-time/src/build/build.properties
   public/yanel/contributions/resources/world-time/src/java/org/wyona/yanel/impl/resources/example/WorldTimeResource.java
Log:
class renamed to avoid conflicts and build simplified

Modified: public/yanel/contributions/resources/world-time/build.xml
===================================================================
--- public/yanel/contributions/resources/world-time/build.xml	2009-08-26 12:21:19 UTC (rev 44402)
+++ public/yanel/contributions/resources/world-time/build.xml	2009-08-26 12:39:51 UTC (rev 44403)
@@ -1,49 +1,5 @@
 <?xml version="1.0"?>
 
-<project name="yanel-resource" default="compile">
-
-  <import file="src/build/dependencies.xml"/>
-
-  <target name="init" description="Initialize build" depends="dependencies">
-    <echo>Initialize build</echo>
-
-    <dirname property="resource.home.dir" file="${ant.file}"/>
-    <echo>Resource Home Directory: ${resource.home.dir}</echo>
-
-    <property file="${resource.home.dir}/src/build/local.build.properties"/>
-    <property file="${resource.home.dir}/src/build/build.properties"/>
-
-    <path id="classpath">
-      <pathelement path="${maven2.cp}"/>
-      <pathelement path="${maven2.resource.cp}"/>
-    </path>
-    <property name="resource.build.dir" value="${resource.home.dir}/build"/>
-    <property name="resource.classes.dir" value="${resource.build.dir}/classes"/>
-    <property name="resource.lib.dir" value="${resource.build.dir}/lib"/>
-    <property name="resource.java.dir" value="${resource.home.dir}/src/java"/>
-  </target>
-
-  <target name="compile" description="Compile Java classes" depends="init">
-
-    <mkdir dir="${resource.classes.dir}"/>
-    <javac srcdir="${resource.java.dir}" destdir="${resource.classes.dir}"
-      classpathref="classpath"
-      debug="true"
-    />
-    <mkdir dir="${resource.lib.dir}"/>
-    <jar destfile="${resource.lib.dir}/yanel-resource-${resource.name}-${resource.version}.jar"
-      basedir="${resource.classes.dir}"
-    />
-  </target>
-
-  <target name="clean" depends="init">
-    <delete dir="${resource.build.dir}"/>
-  </target>
-
-  <target name="copy-dependencies" depends="init">
-    <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib">
-      <fileset refid="maven2.resource.fileset"/>
-      <mapper type="flatten"/>
-    </copy>
-  </target>
+<project name="yanel-example-world-time-resource">
+  <import file="${yanel.source.home}/src/build/resource-types/resource-type.build.xml"/>
 </project>

Modified: public/yanel/contributions/resources/world-time/resource.xml
===================================================================
--- public/yanel/contributions/resources/world-time/resource.xml	2009-08-26 12:21:19 UTC (rev 44402)
+++ public/yanel/contributions/resources/world-time/resource.xml	2009-08-26 12:39:51 UTC (rev 44403)
@@ -3,7 +3,7 @@
 <resource xmlns="http://www.wyona.org/yanel/1.0"
   name="world-time"
   namespace="http://www.wyona.org/yanel/resource/1.0"
-  class="org.wyona.yanel.impl.resources.ExampleResource"
+  class="org.wyona.yanel.impl.resources.example.WorldTimeResource"
   >
   <description>
     World Time resource as a minimal example

Modified: public/yanel/contributions/resources/world-time/src/build/build.properties
===================================================================
--- public/yanel/contributions/resources/world-time/src/build/build.properties	2009-08-26 12:21:19 UTC (rev 44402)
+++ public/yanel/contributions/resources/world-time/src/build/build.properties	2009-08-26 12:39:51 UTC (rev 44403)
@@ -1,2 +1,2 @@
-resource.name=example-resource
-resource.version=0.0.1-dev-rXXX
+resource.name=example-world-time-resource
+resource.version=1.0-dev-rXXX

Modified: public/yanel/contributions/resources/world-time/src/java/org/wyona/yanel/impl/resources/example/WorldTimeResource.java
===================================================================
--- public/yanel/contributions/resources/world-time/src/java/org/wyona/yanel/impl/resources/example/WorldTimeResource.java	2009-08-26 12:21:19 UTC (rev 44402)
+++ public/yanel/contributions/resources/world-time/src/java/org/wyona/yanel/impl/resources/example/WorldTimeResource.java	2009-08-26 12:39:51 UTC (rev 44403)
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.wyona.yanel.impl.resources;
+package org.wyona.yanel.impl.resources.example;
 
 import java.util.Calendar;
 import java.util.HashMap;
@@ -32,16 +32,16 @@
 import org.wyona.yanel.core.attributes.viewable.ViewDescriptor;
 
 /**
- * 
+ * Simple resource example displaying the time
  */
-public class ExampleResource extends Resource implements ViewableV1, CreatableV2 {
+public class WorldTimeResource extends Resource implements ViewableV1, CreatableV2 {
 
-    private static Category log = Category.getInstance(ExampleResource.class);
+    private static Category log = Category.getInstance(WorldTimeResource.class);
 
     /**
      * 
      */
-    public ExampleResource() {
+    public WorldTimeResource() {
     }
 
     /**