Commit Diff


commit - 542a9215d01966cdb476b2d2817ab4f40af445d6
commit + c834f2871e998b3cff66c6a0f260f3e38efe4b2c
blob - 516c1e446391a747dac6650e0c92948ad7770e65
blob + 04346d23d3002f0a477019d4b8a83bba02869deb
--- build.xml
+++ build.xml
@@ -218,12 +218,23 @@
     </copy>
   </target>
 
-  <target depends="compile-util" description="create api jar" name="jar-api">
+  <target depends="compile-api" description="create api jar" name="jar-api">
 	  <jar destfile="${jar}/snipsnap-api.jar">
-		  <fileset dir="${target}/util/" includes="snipsnap/api/**"/>
+		  <fileset dir="${target}/api/" includes="snipsnap/api/**"/>
 	  </jar>
   </target>
  
+  <target description="compile api code" name="compile-api">
+    <mkdir dir="${target}/api"/>
+    <javac deprecation="${deprecation}" debug="${debug}"
+      srcdir="${src}"
+      destdir="${target}/api"
+      classpathref="all.classpath">
+
+      <include name="snipsnap/api/**"/>
+    </javac>
+  </target>
+
   <!-- create server code -->
   <target depends="compile-jsp, compile-server,installer-war,snipsnap-war" description="create server jar" name="jar-server">
     <copy file="conf/copyright.txt" tofile="${target}/server/conf/copyright.txt" filtering="true">
blob - 47b964f6c11d7198eb9c2b99cdd19e94c6226323
blob + aac4ecf0ba7ef711ac7930140adce630417a2d97
Binary files lib/rss-ng-1.0-alpha-1.jar and lib/rss-ng-1.0-alpha-1.jar differ
blob - 3fef9ec49859ef8d7d2f8826b5881754d7f4f319 (mode 644)
blob + /dev/null
--- src/META-INF/services/org.snipsnap.snip.label.Label
+++ /dev/null
@@ -1,9 +0,0 @@
-#org.snipsnap.snip.label.DefaultLabel
-org.snipsnap.snip.label.SnipLabel
-org.snipsnap.snip.label.TypeLabel
-#org.snipsnap.snip.label.ComplexLabel
-org.snipsnap.snip.label.BooleanLabel
-org.snipsnap.snip.label.RenderEngineLabel
-org.snipsnap.snip.label.CategoryLabel
-org.snipsnap.snip.label.TaxonomyLabel
-org.snipsnap.snip.label.TypeLabel
\ No newline at end of file
blob - /dev/null
blob + 3fef9ec49859ef8d7d2f8826b5881754d7f4f319 (mode 644)
--- /dev/null
+++ src/META-INF/services/snipsnap.api.label.Label
@@ -0,0 +1,9 @@
+#org.snipsnap.snip.label.DefaultLabel
+org.snipsnap.snip.label.SnipLabel
+org.snipsnap.snip.label.TypeLabel
+#org.snipsnap.snip.label.ComplexLabel
+org.snipsnap.snip.label.BooleanLabel
+org.snipsnap.snip.label.RenderEngineLabel
+org.snipsnap.snip.label.CategoryLabel
+org.snipsnap.snip.label.TaxonomyLabel
+org.snipsnap.snip.label.TypeLabel
\ No newline at end of file
blob - 78047b3a616353a1508660d2d465ad66299e1d95
blob + d03b99d5be6e60aa3ad615d4c2ae4dce4879ed78
--- src/org/snipsnap/snip/label/RenderEngineLabel.java
+++ src/org/snipsnap/snip/label/RenderEngineLabel.java
@@ -31,7 +31,6 @@ import snipsnap.api.container.Components;
 import snipsnap.api.snip.Snip;
 import snipsnap.api.label.*;
 import snipsnap.api.label.LabelContext;
-import org.radeox.api.engine.RenderEngine;
 
 import java.util.Map;
 
blob - 0884c39a3a69396fc6052d60c22bba5f1578a04a
blob + f586e6d94141b30fe9f0f718b92ad9f5566fda5b
--- src/snipsnap/api/label/Labels.java
+++ src/snipsnap/api/label/Labels.java
@@ -32,6 +32,7 @@ import org.snipsnap.snip.label.LabelManager;
 import snipsnap.api.app.Application;
 
 import java.util.*;
+import java.util.logging.Logger;
 
 /**
  * Stores Label information for a snip
@@ -142,6 +143,9 @@ public class Labels {
     if (label != null) {
       label.setName(name);
       label.setValue(value);
+
+    } else {
+      System.err.println("Labels: Label not found: "+type);
     }
     return label;
   }