Renames methods

[mkjsf-moved-to-github.git] / pom.xml

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