X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=pom.xml;h=78db37d77aff074317a1b5de5691bc0bebc6d069;hb=f41aebdc948f44c37d8eba8724f9cdd520b8a93e;hp=bf0dd7f98aa962cbd754dd6646cfb00ab11a784b;hpb=6ce8a8a810865be4b7d126170708e85e88b48721;p=mkjsf-moved-to-github.git

diff --git a/pom.xml b/pom.xml
index bf0dd7f..78db37d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.indexdata</groupId>
   <artifactId>mkjsf</artifactId>
-  <version>0.0.3</version>
+  <version>0.0.8-SNAPSHOT</version>
   <name>MasterKey JSF</name>
   <packaging>jar</packaging>
   <description>MKJSF - JavaServer Faces library for MasterKey</description>
@@ -14,7 +14,7 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- JSF 2 -->
+    <!-- JSF 2, JSP tag library, Weld, CDI -->
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.faces</artifactId>
@@ -24,19 +24,14 @@
       <groupId>javax.servlet.jsp.jstl</groupId>
       <artifactId>javax.servlet.jsp.jstl-api</artifactId>
       <version>1.2.1</version>      
-    </dependency>
-    <!-- Weld, Dependency Injection (CDI) -->
+    </dependency>    
     <dependency>
       <groupId>org.jboss.weld.servlet</groupId>
       <artifactId>weld-servlet</artifactId>
       <version>1.1.10.Final</version>      
-    </dependency>    
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.2.3</version>
-    </dependency>
-    <!-- File upload -->
+    </dependency> 
+
+    <!-- File upload etc -->
     <dependency>
       <groupId>org.apache.myfaces.tomahawk</groupId>
       <artifactId>tomahawk20</artifactId>
@@ -46,11 +41,18 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>2.1</version>
-    </dependency>    
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.2.3</version>
+    </dependency>
+     
+    <!-- Pazpar2 client -->   
     <dependency>
       <groupId>com.indexdata</groupId>
       <artifactId>masterkey-common</artifactId>
-      <version>0.1.10</version>
+      <version>0.1.36</version>
     </dependency>
   </dependencies>
   <build>
@@ -63,6 +65,7 @@
         <excludes>          
           <exclude>main/</exclude>
           <exclude>*.java</exclude>
+          <exclude>META-INF/beans.xml</exclude>
         </excludes>
       </resource>
     </resources>
@@ -90,12 +93,20 @@
           <localCheckout>true</localCheckout>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.2</version>
+        <configuration>
+          <classifier>${env}</classifier>
+        </configuration>
+      </plugin>
     </plugins>
     <extensions>
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-ssh</artifactId>
-        <version>1.0-beta-6</version>
+        <version>2.8</version>
       </extension>
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
@@ -109,11 +120,11 @@
       <uniqueVersion>false</uniqueVersion>
       <id>id-maven-repo</id>
       <name>Index Data Maven Repository</name>
-      <url>scp://maven.indexdata.com:222/var/www/maven/repository</url>
+      <url>scp://maven.indexdata.com:22/var/www/maven/repository</url>
     </repository>
     <site>
       <id>id-website</id>
-      <url>scpexe://www.indexdata.com/var/www/software/mkjsf/</url>
+      <url>scpexe://www.indexdata.com/var/www/software/mkjsf/project/</url>
     </site>
   </distributionManagement>  
   <repositories>
@@ -123,12 +134,63 @@
     </repository>
   </repositories>
   <scm>
-    <connection>scm:git:ssh://git.indexdata.com:222/home/git/private/mkjsf</connection>
+    <connection>scm:git:ssh://git.indexdata.com:222/home/git/pub/mkjsf</connection>
     <url>http://gitid.indexdata.com/?p=mkjsf.git</url>
   </scm>
   
   <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <env />
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>    
   </properties>
   
-</project>
\ No newline at end of file
+  <profiles>
+    <profile>
+      <!-- Tomcat 7 profile, includes JSF 2.0 and Weld -->
+      <id>default</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <env />
+      </properties>
+      <dependencies>
+      </dependencies>
+      <build>
+        <resources>
+          <resource>
+            <targetPath>META-INF</targetPath>
+            <directory>src/main/resources/tomcat</directory>
+            <includes>
+              <include>beans.xml</include>
+            </includes>
+          </resource>
+        </resources>
+      </build>
+    </profile>
+    <profile>
+      <!-- J2EE Application Server profile (Glassfish, JBoss) -->
+      <!-- beans.xml contains information of which configuration 
+           scheme to inject. Optimally this would be decided at 
+           the .war/application level, not at (this) jar/library
+           level, but for now this is necessary when using Glassfish
+           or JBoss -->
+      <id>as</id>
+      <properties>
+        <env>as</env>
+      </properties>
+      <dependencies>
+      </dependencies>
+      <build>
+        <resources>
+          <resource>
+            <targetPath>META-INF</targetPath>
+            <directory>src/main/resources/as</directory>
+            <includes>
+              <include>beans.xml</include>
+            </includes>
+          </resource>
+        </resources>
+      </build>      
+    </profile>
+  </profiles>
+</project>