[dna-commits] DNA SVN: r188 - in branches/federation: sequencers/dna-sequencer-mp3/src/main/java/org/jboss/dna/sequencer/mp3 and 1 other directory.

Author: rhauch Date: 2008-05-23 14:26:11 -0400 (Fri, 23 May 2008) New Revision: 188 Modified: branches/federation/pom.xml branches/federation/sequencers/dna-sequencer-mp3/src/main/java/org/jboss/dna/sequencer/mp3/Mp3MetadataSequencer.java Log: Merged changes from trunk to federation branch: svn merge -r 173:187 https://svn.jboss.org/repos/dna/trunk . Modified: branches/federation/pom.xml =================================================================== --- branches/federation/pom.xml 2008-05-23 16:53:59 UTC (rev 187) +++ branches/federation/pom.xml 2008-05-23 18:26:11 UTC (rev 188) @@ -12,6 +12,48 @@ <scm> <connection>scm:svn:https://svn.jboss.org/repos/dna/trunk</connectio... </scm> + <developers> + <developer> + <name>Randall Hauch</name> + <id>randall</id> + <email&gt;rhauch(a)redhat.com&lt;/email&gt; + <organization>Red Hat</organization> + <roles> + <role>Project Lead</role> + <role>Developer</role> + </roles> + <timezone>-6</timezone> + </developer> + <developer> + <name>John Verhaeg</name> + <id>johnny</id> + <email&gt;jverhaeg(a)redhat.com&lt;/email&gt; + <organization>Red Hat</organization> + <roles> + <role>Developer</role> + </roles> + <timezone>-6</timezone> + </developer> + <developer> + <name>Dan Florian</name> + <id>dan</id> + <email&gt;dflorian(a)redhat.com&lt;/email&gt; + <organization>Red Hat</organization> + <roles> + <role>Developer</role> + </roles> + <timezone>-6</timezone> + </developer> + <developer> + <name>Stefano Maestri</name> + <id>stefano</id> + <email&gt;stefano.maestri(a)javalinux.it&lt;/email&gt; + <roles> + <role>Developer</role> + </roles> + <timezone>+1</timezone> + </developer> + </developers> <modules> <module>dna-common</module> <module>dna-spi</module> @@ -25,6 +67,7 @@ <properties> <dna-version>0.2-SNAPSHOT</dna-version> </properties> + <profiles> <profile> <id>release</id> @@ -81,23 +124,23 @@ </execution> </executions> <configuration> - <finalName> - jboss-dna-${project.version} - </finalName> - <descriptors> - <descriptor> - build/assembly/examples.xml - </descriptor> - <descriptor> - build/assembly/javadoc.xml - </descriptor> - <descriptor> - build/assembly/dist.xml - </descriptor> - <descriptor> - build/assembly/src.xml - </descriptor> - </descriptors> + <finalName> + jboss-dna-${project.version} + </finalName> + <descriptors> + <descriptor> + build/assembly/examples.xml + </descriptor> + <descriptor> + build/assembly/javadoc.xml + </descriptor> + <descriptor> + build/assembly/dist.xml + </descriptor> + <descriptor> + build/assembly/src.xml + </descriptor> + </descriptors> </configuration> </plugin> </plugins> @@ -366,12 +409,24 @@ </plugin> </plugins> </reporting> - <distributionManagement> - <repository> - <!-- Copy the distribution jar file to a local checkout of the maven repository - - This variable can be set in $MAVEN_HOME/conf/settings.xml --> - <id>repository.jboss.org</id> - <url>file://${jboss.repository.root}</url> - </repository> - </distributionManagement> -</project> \ No newline at end of file + + <repositories> + <repository> + <id>jboss</id> + <url>http://repository.jboss.com/maven2/</url> + </repository> + + <repository> + <id>jboss-snapshot</id> + <url>http://snapshots.jboss.org/maven2</url> + </repository> + </repositories> + <distributionManagement> + <repository> + <!-- Copy the distribution jar file to a local checkout of the maven repository + - This variable can be set in $MAVEN_HOME/conf/settings.xml --> + <id>repository.jboss.org</id> + <url>file://${jboss.repository.root}</url> + </repository> + </distributionManagement> +</project> Modified: branches/federation/sequencers/dna-sequencer-mp3/src/main/java/org/jboss/dna/sequencer/mp3/Mp3MetadataSequencer.java =================================================================== --- branches/federation/sequencers/dna-sequencer-mp3/src/main/java/org/jboss/dna/sequencer/mp3/Mp3MetadataSequencer.java 2008-05-23 16:53:59 UTC (rev 187) +++ branches/federation/sequencers/dna-sequencer-mp3/src/main/java/org/jboss/dna/sequencer/mp3/Mp3MetadataSequencer.java 2008-05-23 18:26:11 UTC (rev 188) @@ -34,8 +34,6 @@ * <ul> * <li><strong>mp3:metadata</strong> node of type <code>mp3:metadata</code> * <ul> - * <li><strong>jcr:mimeType</strong> - optional string property for the mime type of the image</li> - * <li><strong>jcr:encoding</strong> - optional string property for the encoding of the image</li> * <li><strong>mp3:title</strong> - optional string property for the name of the audio file or recording</li> * <li><strong>mp3:author</strong> - optional string property for the author of the recording</li> * <li><strong>mp3:album</strong> - optional string property for the name of the album</li> @@ -67,9 +65,7 @@ if (metadata != null) { // Place the image metadata into the output map ... output.setProperty(METADATA_NODE, MP3_PRIMARY_TYPE, "mp3:metadata"); - // output.psetProperty(METADATA_NODE, IMAGE_MIXINS, ""); output.setProperty(METADATA_NODE, MP3_TITLE, metadata.getTitle()); - // output.setProperty(METADATA_NODE, IMAGE_ENCODING, ""); output.setProperty(METADATA_NODE, MP3_AUTHOR, metadata.getAuthor()); output.setProperty(METADATA_NODE, MP3_ALBUM, metadata.getAlbum()); output.setProperty(METADATA_NODE, MP3_YEAR, metadata.getYear());