kadosu-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 121
committer: Martin Schaaf <mascha@xxxxxxxxxx>
branch nick: kadosu
timestamp: Sun 2009-11-22 21:00:50 +0100
message:
  o change interface IDocumentSpeech: config file is a URL instead of a string
  o build and classpath fixes
modified:
  org.kadosu.plugin.speech/META-INF/MANIFEST.MF
  org.kadosu.plugin.speech/build.properties
  org.kadosu.plugin.speech/src/main/java/org/kadosu/document/plugin/speech/DocumentSpeech.java
  org.kadosu.plugin.speech/src/main/java/org/kadosu/document/plugin/speech/IDocumentSpeech.java
  org.kadosu.plugin.speech/src/test/java/org/kadosu/document/plugin/speech/DocumentSpeechTest.java


--
lp:kadosu
https://code.launchpad.net/~kadosu-dev/kadosu/main

Your team Kadosu Developer is subscribed to branch lp:kadosu.
To unsubscribe from this branch go to https://code.launchpad.net/~kadosu-dev/kadosu/main/+edit-subscription.

=== modified file 'org.kadosu.plugin.speech/META-INF/MANIFEST.MF'
--- org.kadosu.plugin.speech/META-INF/MANIFEST.MF	2009-11-09 19:08:09 +0000
+++ org.kadosu.plugin.speech/META-INF/MANIFEST.MF	2009-11-22 20:00:50 +0000
@@ -2,11 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Speech Plug-in
 Bundle-SymbolicName: org.kadosu.plugin.speech
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.kadosu.plugin.speech.SpeechPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="1.3.0"
 Require-Bundle: org.kadosu;bundle-version="0.2.0",
- edu.cmu.sphinx;bundle-version="1.0.0"
+ edu.cmu.sphinx;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.4.3"
+Bundle-ClassPath: org.kadosu.document.plugin.speech.jar
 Export-Package: org.kadosu.document.plugin.speech

=== modified file 'org.kadosu.plugin.speech/build.properties'
--- org.kadosu.plugin.speech/build.properties	2009-11-09 19:08:09 +0000
+++ org.kadosu.plugin.speech/build.properties	2009-11-22 20:00:50 +0000
@@ -1,11 +1,10 @@
 bin.includes = META-INF/,\
-               org.kadosu.plugin.speech.jar
-jars.compile.order = org.kadosu.plugin.speech.jar
-source.org.kadosu.plugin.speech.jar = src/main/java/
-output.org.kadosu.plugin.speech.jar = bin/
+               org.kadosu.document.plugin.speech.jar
+jars.compile.order = org.kadosu.document.plugin.speech.jar
 src.includes = build.properties,\
                META-INF/,\
                src/,\
                .settings/,\
                .project,\
                .classpath
+source.org.kadosu.document.plugin.speech.jar = src/main/java/

=== modified file 'org.kadosu.plugin.speech/src/main/java/org/kadosu/document/plugin/speech/DocumentSpeech.java'
--- org.kadosu.plugin.speech/src/main/java/org/kadosu/document/plugin/speech/DocumentSpeech.java	2009-11-09 19:08:09 +0000
+++ org.kadosu.plugin.speech/src/main/java/org/kadosu/document/plugin/speech/DocumentSpeech.java	2009-11-22 20:00:50 +0000
@@ -4,6 +4,7 @@
 import java.io.File;
 import java.io.Reader;
 import java.io.StringReader;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -23,7 +24,7 @@
 
   private File fPath;
 
-  private String fConfigFile;
+  private URL fConfigFile;
 
   private ConfigurationManager fCm;
 
@@ -93,7 +94,7 @@
    * 
    * @see org.kadosu.document.plugin.speech.IDocumentSpeech#setConfigFile(java.lang.String)
    */
-  public void setConfigFile( String configFile) {
+  public void setConfigFile( URL configFile) {
     fConfigFile = configFile;
   }
 
@@ -102,7 +103,7 @@
    * 
    * @see org.kadosu.document.plugin.speech.IDocumentSpeech#getConfigFile()
    */
-  public String getConfigFile() {
+  public URL getConfigFile() {
     return fConfigFile;
   }
 

=== modified file 'org.kadosu.plugin.speech/src/main/java/org/kadosu/document/plugin/speech/IDocumentSpeech.java'
--- org.kadosu.plugin.speech/src/main/java/org/kadosu/document/plugin/speech/IDocumentSpeech.java	2009-11-09 19:08:09 +0000
+++ org.kadosu.plugin.speech/src/main/java/org/kadosu/document/plugin/speech/IDocumentSpeech.java	2009-11-22 20:00:50 +0000
@@ -1,9 +1,11 @@
 package org.kadosu.document.plugin.speech;
 
+import java.net.URL;
+
 public interface IDocumentSpeech {
 
-  public abstract void setConfigFile( String configFile);
+  public abstract void setConfigFile( URL configFile);
 
-  public abstract String getConfigFile();
+  public abstract URL getConfigFile();
 
 }

=== modified file 'org.kadosu.plugin.speech/src/test/java/org/kadosu/document/plugin/speech/DocumentSpeechTest.java'
--- org.kadosu.plugin.speech/src/test/java/org/kadosu/document/plugin/speech/DocumentSpeechTest.java	2009-11-09 19:08:09 +0000
+++ org.kadosu.plugin.speech/src/test/java/org/kadosu/document/plugin/speech/DocumentSpeechTest.java	2009-11-22 20:00:50 +0000
@@ -14,7 +14,7 @@
   public void testGetContent() throws KDSAccessException, IOException {
     DocumentSpeech documentSpeech = new DocumentSpeech();
     URL resource = DocumentSpeechTest.class.getResource( "/speechConfig.xml");
-    documentSpeech.setConfigFile( resource.getFile());
+    documentSpeech.setConfigFile( resource);
     documentSpeech.setDocument( "/home/ms/temp/kadosuTestData/audio/1984.wav");
     Reader content = documentSpeech.getContent();
     char[] read = new char[4096];