included the monitor jar and dependencies in the rpm

added a gitignore file to ignore target directories.

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..d913617
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+target
+

diff --git a/monitor/pom.xml b/monitor/pom.xml
index 0b359b91c688724dc225dff31a015632ad56b61e..544224b821d6e18b47252d4edb879a3d28030e3f 100644 (file)
--- a/monitor/pom.xml
+++ b/monitor/pom.xml
@@ -12,7 +12,10 @@
   <packaging>jar</packaging>
   <name>/monitor</name>
   <dependencies>
-   
+      <dependency>
+          <groupId>org.teleal.cling</groupId>
+          <artifactId>cling-core</artifactId>
+      </dependency>
   </dependencies>
 
 </project>

diff --git a/pom.xml b/pom.xml
index af1982eb5655429188940e59ce4fa5a27dab8d97..4b8ad15e118e4d176b33d58ef26930e6891daa2d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,11 @@
 
        <dependencyManagement>
                <dependencies>
+                   <dependency>
+                <groupId>org.teleal.cling</groupId>
+                <artifactId>cling-core</artifactId>
+                <version>1.0.5</version>
+            </dependency>
                        <dependency>
                                <groupId>javax.faces</groupId>
                                <artifactId>jsf-api</artifactId>
@@ -539,6 +544,17 @@
                        <url>file:${distrib}/main</url>
                </site>
        </distributionManagement>
+       
+       <repositories>
+        <repository>
+            <id>teleal-repo</id>
+            <url>http://teleal.org/m2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
 
        <properties>
                <spring.version>2.0.8</spring.version>

diff --git a/rpm/pom.xml b/rpm/pom.xml
index 85e0b467d49ab81b779976f7b4d803dffd6299f1..ef44081bf78a89327538a94004e12aa708736978 100644 (file)
--- a/rpm/pom.xml
+++ b/rpm/pom.xml
@@ -12,6 +12,14 @@
     <artifactId>rpm</artifactId>
        <packaging>rpm</packaging>
     <name>/rpm</name>
+       
+       <dependencies>
+           <dependency>
+                   <groupId>org.wamblee.upnpmonitor</groupId>
+                       <artifactId>monitor</artifactId>
+                       <version>0.1-SNAPSHOT</version>
+               </dependency>
+       </dependencies>
 
     <build>
         <plugins>
@@ -38,6 +46,14 @@
                                 </source>
                             </sources>
                         </mapping>
+                                               
+                                               <mapping>
+                                                   <directory>/opt/upnpmonitor/lib</directory>
+                                                       <filemode>755</filemode>
+                                                       <username>root</username>
+                                                       <groupname>root</groupname>
+                                                       <dependency/>
+                                               </mapping>
                        
                         <mapping>
                             <directory>/etc/profile.d</directory>