Permalink
Browse files

maven 2 pom added, structure changed to match

test script tweaked to use maven exec plugin
  • Loading branch information...
1 parent f09b608 commit fea72950354e9646727e55834a5de5268f93b845 @arimus committed Mar 9, 2012
Showing with 280 additions and 1 deletion.
  1. +279 −0 pom.xml
  2. 0 src/main/filters/filter.properties
  3. 0 src/{ → main}/java/.svn/all-wcprops
  4. 0 src/{ → main}/java/.svn/entries
  5. 0 src/{ → main}/java/net/.svn/all-wcprops
  6. 0 src/{ → main}/java/net/.svn/entries
  7. 0 src/{ → main}/java/net/sf/.svn/all-wcprops
  8. 0 src/{ → main}/java/net/sf/.svn/entries
  9. 0 src/{ → main}/java/net/sf/jmimemagic/.svn/all-wcprops
  10. 0 src/{ → main}/java/net/sf/jmimemagic/.svn/entries
  11. 0 src/{ → main}/java/net/sf/jmimemagic/.svn/text-base/Magic.java.svn-base
  12. 0 src/{ → main}/java/net/sf/jmimemagic/.svn/text-base/MagicDetector.java.svn-base
  13. 0 src/{ → main}/java/net/sf/jmimemagic/.svn/text-base/MagicException.java.svn-base
  14. 0 src/{ → main}/java/net/sf/jmimemagic/.svn/text-base/MagicMatch.java.svn-base
  15. 0 src/{ → main}/java/net/sf/jmimemagic/.svn/text-base/MagicMatchNotFoundException.java.svn-base
  16. 0 src/{ → main}/java/net/sf/jmimemagic/.svn/text-base/MagicMatcher.java.svn-base
  17. 0 src/{ → main}/java/net/sf/jmimemagic/.svn/text-base/MagicParseException.java.svn-base
  18. 0 src/{ → main}/java/net/sf/jmimemagic/.svn/text-base/MagicParser.java.svn-base
  19. 0 src/{ → main}/java/net/sf/jmimemagic/.svn/text-base/UnsupportedTypeException.java.svn-base
  20. 0 src/{ → main}/java/net/sf/jmimemagic/.svn/text-base/package.html.svn-base
  21. 0 src/{ → main}/java/net/sf/jmimemagic/Magic.java
  22. 0 src/{ → main}/java/net/sf/jmimemagic/MagicDetector.java
  23. 0 src/{ → main}/java/net/sf/jmimemagic/MagicException.java
  24. 0 src/{ → main}/java/net/sf/jmimemagic/MagicMatch.java
  25. 0 src/{ → main}/java/net/sf/jmimemagic/MagicMatchNotFoundException.java
  26. 0 src/{ → main}/java/net/sf/jmimemagic/MagicMatcher.java
  27. 0 src/{ → main}/java/net/sf/jmimemagic/MagicParseException.java
  28. 0 src/{ → main}/java/net/sf/jmimemagic/MagicParser.java
  29. 0 src/{ → main}/java/net/sf/jmimemagic/UnsupportedTypeException.java
  30. 0 src/{ → main}/java/net/sf/jmimemagic/detectors/.svn/all-wcprops
  31. 0 src/{ → main}/java/net/sf/jmimemagic/detectors/.svn/entries
  32. 0 src/{ → main}/java/net/sf/jmimemagic/detectors/.svn/text-base/TextFileDetector.java.svn-base
  33. 0 src/{ → main}/java/net/sf/jmimemagic/detectors/.svn/text-base/package.html.svn-base
  34. 0 src/{ → main}/java/net/sf/jmimemagic/detectors/TextFileDetector.java
  35. 0 src/{ → main}/java/net/sf/jmimemagic/detectors/package.html
  36. 0 src/{ → main}/java/net/sf/jmimemagic/package.html
  37. 0 { → src/main}/resources/.svn/all-wcprops
  38. 0 { → src/main}/resources/.svn/entries
  39. 0 { → src/main}/resources/.svn/text-base/log4j.properties.svn-base
  40. 0 { → src/main}/resources/.svn/text-base/magic.dtd.svn-base
  41. 0 { → src/main}/resources/.svn/text-base/magic.xml.basic.svn-base
  42. 0 { → src/main}/resources/.svn/text-base/magic.xml.svn-base
  43. 0 { → src/main}/resources/.svn/text-base/magic.xml.verified.svn-base
  44. 0 { → src/main}/resources/.svn/text-base/magic_1_0.dtd.svn-base
  45. 0 { → src/main}/resources/.svn/text-base/template.xml.svn-base
  46. 0 { → src/main}/resources/log4j.properties
  47. 0 { → src/main}/resources/magic.dtd
  48. 0 { → src/main}/resources/magic.xml
  49. 0 { → src/main}/resources/magic.xml.basic
  50. 0 { → src/main}/resources/magic.xml.verified
  51. 0 { → src/main}/resources/magic_1_0.dtd
  52. 0 { → src/main}/resources/template.xml
  53. 0 src/test/{ → java}/net/.svn/all-wcprops
  54. 0 src/test/{ → java}/net/.svn/entries
  55. 0 src/test/{ → java}/net/sf/.svn/all-wcprops
  56. 0 src/test/{ → java}/net/sf/.svn/entries
  57. 0 src/test/{ → java}/net/sf/jmimemagic/.svn/all-wcprops
  58. 0 src/test/{ → java}/net/sf/jmimemagic/.svn/entries
  59. 0 src/test/{ → java}/net/sf/jmimemagic/.svn/text-base/MagicTest.java.svn-base
  60. 0 src/test/{ → java}/net/sf/jmimemagic/MagicTest.java
  61. +1 −1 test
View
@@ -0,0 +1,279 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+
+ <!-- General for All Maven projects (lib and proj) -->
+
+ <groupId>net.sf.jmimemagic</groupId>
+ <artifactId>jmimemagic</artifactId>
+ <version>0.1.3</version>
+ <packaging>jar</packaging>
+
+ <name>jMimeMagic</name>
+ <url>http://github.com/arimus/jmimemagic/</url>
+ <description>jMimeMagic is a Java library for determining the content type of files or streams.</description>
+
+ <developers>
+ <developer>
+ <id>arimus</id>
+ <name>David Castro</name>
+ <email>arimus@users.sourceforge.net</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <organization>jmimemagic</organization>
+ <timezone>-7</timezone>
+ </developer>
+
+ <developer>
+ <id>ndjones</id>
+ <name>Nate Jones</name>
+ <email>ndjones@users.sourceforge.net</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <organization>jmimemagic</organization>
+ <timezone>-7</timezone>
+ </developer>
+ </developers>
+
+ <!-- use the following if you're not using a snapshot version. -->
+ <distributionManagement>
+ <repository>
+ <id>jmimemagic-repo</id>
+ <name>jMimeMagic Repo</name>
+ <url>scm:svn:https://svn.sourceforge.net/svnroot/jmimemagic/trunk</url>
+ </repository>
+ <!-- use the following if you ARE using a snapshot version. -->
+ <snapshotRepository>
+ <id>jmimemagic-repo</id>
+ <name>jMimeMagic Repo</name>
+ <url>scm:svn:https://svn.sourceforge.net/svnroot/jmimemagic/trunk</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+
+ <!-- Repositories, currently used to make hibernate3:schema-export and jalopy work -->
+
+ <!--
+ <repositories>
+ <repository>
+ <id>Codehaus Snapshots</id>
+ <url>http://snapshots.repository.codehaus.org</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2</url>
+ <layout>default</layout>
+ </repository>
+ <repository>
+ <id>repository.jboss.com</id>
+ <name>JBoss Repository for Maven</name>
+ <url>http://repository.jboss.com/maven2</url>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+ -->
+
+ <!-- Repositories, currently used to make hibernate3:schema-export work -->
+
+ <!--
+ <pluginRepositories>
+ <pluginRepository>
+ <id>Codehaus Snapshots</id>
+ <url>http://snapshots.repository.codehaus.org</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+ -->
+
+ <build>
+
+ <!-- turning filter on for resources and test, note - test resources dir will override any file with the same name in main resources when a test is ran. -->
+ <filters>
+ <filter>src/main/filters/filter.properties</filter>
+ </filters>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>*.properties</include>
+ <include>*.xml</include>
+ <include>*.dtd</include>
+ </includes>
+ <excludes>
+ <exclude>log4j.properties</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+
+ <plugins>
+
+ <!-- Code format java files, use mvn jalopy:format -->
+ <!--
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jalopy-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <configuration>
+ <convention>geekoffice/jalopy.xml</convention>
+ <failOnError>false</failOnError>
+ <fileFormat>UNIX</fileFormat>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>format</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+
+ <!-- compile in jdk 1.5 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <!--<version>2.2</version>-->
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+
+
+ <extensions>
+
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-alpha-5</version>
+ </extension>
+
+ </extensions>
+
+ </build>
+
+ <!-- dependencies need by both lib and proj -->
+
+ <dependencies>
+
+ <!-- common compile time dependencies -->
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- common runtime only dependencies -->
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <scope>runtime</scope>
+ </dependency>
+
+
+ <!-- common testing only dependencies -->
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ <version>2.4.0</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.0.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ </dependencies>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+
+</project>
No changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -1,3 +1,3 @@
#!/bin/sh
-maven clean run -Dclass=net.sf.jmimemagic.Magic -Dargs=$1
+mvn exec:java -Dexec.mainClass="net.sf.jmimemagic.Magic" -Dexec.args="$1"

0 comments on commit fea7295

Please sign in to comment.