You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ju...@apache.org on 2010/06/21 16:03:26 UTC

svn commit: r956596 - in /pdfbox/trunk: pdfbox/build.xml pdfbox/pdfbox.war/ pom.xml war/ war/pom.xml war/src/ war/src/main/ war/src/main/webapp/

Author: jukka
Date: Mon Jun 21 14:03:26 2010
New Revision: 956596

URL: http://svn.apache.org/viewvc?rev=956596&view=rev
Log:
PDFBOX-753: Move PDFBox war into a separate component

Added:
    pdfbox/trunk/war/   (with props)
    pdfbox/trunk/war/pom.xml   (with props)
    pdfbox/trunk/war/src/
    pdfbox/trunk/war/src/main/
    pdfbox/trunk/war/src/main/webapp/
      - copied from r956541, pdfbox/trunk/pdfbox/pdfbox.war/
Removed:
    pdfbox/trunk/pdfbox/pdfbox.war/
Modified:
    pdfbox/trunk/pdfbox/build.xml
    pdfbox/trunk/pom.xml

Modified: pdfbox/trunk/pdfbox/build.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/build.xml?rev=956596&r1=956595&r2=956596&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/build.xml (original)
+++ pdfbox/trunk/pdfbox/build.xml Mon Jun 21 14:03:26 2010
@@ -28,7 +28,6 @@
     <property name="test.dir" value="src/test/java" />
     <property name="testfiles.dir" value="src/test/resources" />
     <property name="bin.dir" value="bin" />
-    <property name="war.dir" value="pdfbox.war" />
     <property name="tool.dir" value="tools" />
     <property name="resources.dir" value="src/main/resources" />
     <property name="download.dir" value="download" />
@@ -404,12 +403,6 @@
                 <attribute name="Implementation-URL" value="http://pdfbox.apache.org/"/>
             </manifest>
         </jar>
-        <zip zipfile="./${target.dir}/${project.name}-${project.version}.war">
-            <fileset dir="${war.dir}" />
-            <zipfileset dir="./${target.dir}" prefix="WEB-INF/lib">
-                <include name="${release.name}.jar" />
-            </zipfileset>
-        </zip>
     </target>
 
     <!-- We use Maven to create the release packages. Keep this target for -->

Modified: pdfbox/trunk/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pom.xml?rev=956596&r1=956595&r2=956596&view=diff
==============================================================================
--- pdfbox/trunk/pom.xml (original)
+++ pdfbox/trunk/pom.xml Mon Jun 21 14:03:26 2010
@@ -49,6 +49,7 @@
     <module>pdfbox</module>
     <module>lucene</module>
     <module>ant</module>
+    <module>war</module>
     <module>app</module>
   </modules>
 

Propchange: pdfbox/trunk/war/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 21 14:03:26 2010
@@ -0,0 +1,2 @@
+target
+.*

Added: pdfbox/trunk/war/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/war/pom.xml?rev=956596&view=auto
==============================================================================
--- pdfbox/trunk/war/pom.xml (added)
+++ pdfbox/trunk/war/pom.xml Mon Jun 21 14:03:26 2010
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ! Licensed to the Apache Software Foundation (ASF) under one or more
+ ! contributor license agreements.  See the NOTICE file distributed with
+ ! this work for additional information regarding copyright ownership.
+ ! The ASF licenses this file to You under the Apache License, Version 2.0
+ ! (the "License"); you may not use this file except in compliance with
+ ! the License.  You may obtain a copy of the License at
+ !
+ !      http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+
+<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>
+
+  <parent>
+    <groupId>org.apache.pdfbox</groupId>
+    <artifactId>pdfbox-parent</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+    <relativePath>../parent/pom.xml</relativePath>
+  </parent>
+
+  <artifactId>pdfbox-war</artifactId>
+  <packaging>war</packaging>
+  <name>Apache PDFBox webapp</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>pdfbox</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>

Propchange: pdfbox/trunk/war/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native