Author: glen
Date: Fri Jan 4 08:21:47 2008
New Revision: 11850
Log:
Comment repeated extension mapping in web.xml, and fix Windows build of JAXWS
module by making some dependencies explicit.
Modified:
trunk/wsas/java/modules/core/lib/appservers/tomcat/embedded/web.xml
trunk/wsas/java/modules/samples/JAXWS/pom.xml
Modified: trunk/wsas/java/modules/core/lib/appservers/tomcat/embedded/web.xml
==============================================================================
--- trunk/wsas/java/modules/core/lib/appservers/tomcat/embedded/web.xml
(original)
+++ trunk/wsas/java/modules/core/lib/appservers/tomcat/embedded/web.xml Fri Jan
4 08:21:47 2008
@@ -1150,10 +1150,10 @@
<extension>Z</extension>
<mime-type>application/x-compress</mime-type>
</mime-mapping>
- <mime-mapping>
- <extension>z</extension>
- <mime-type>application/x-compress</mime-type>
- </mime-mapping>
+ <!--<mime-mapping>-->
+ <!--<extension>z</extension>-->
+ <!--<mime-type>application/x-compress</mime-type>-->
+ <!--</mime-mapping>-->
<mime-mapping>
<extension>zip</extension>
<mime-type>application/zip</mime-type>
Modified: trunk/wsas/java/modules/samples/JAXWS/pom.xml
==============================================================================
--- trunk/wsas/java/modules/samples/JAXWS/pom.xml (original)
+++ trunk/wsas/java/modules/samples/JAXWS/pom.xml Fri Jan 4 08:21:47 2008
@@ -1,96 +1,115 @@
-<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";>
-
- <parent>
- <groupId>org.wso2.wsas</groupId>
- <artifactId>wso2wsas-samples</artifactId>
- <version>SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>wso2wsas-samples-jaxws</artifactId>
- <packaging>jar</packaging>
- <name>Sample/JAXWS</name>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
- <!--<resources>
- <resource>
- <directory>resources</directory>
- </resource>
- </resources>-->
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <!--<plugin>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-aar-maven-plugin</artifactId>
- <version>1.3</version>
- <extensions>true</extensions>
- <configuration>
-
<servicesXmlFile>resources/META-INF/services.xml</servicesXmlFile>
-
<wsdlFile>resources/META-INF/CalculatorService.wsdl</wsdlFile>
- <includeDependencies>false</includeDependencies>
- </configuration>
- </plugin>-->
- <plugin>
- <inherited>false</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-code</id>
- <phase>generate-sources</phase>
- <configuration>
- <tasks>
- <java
classname="org.wso2.utils.codegen.CodegenHelper" fork="true">
- <arg value="./conf/codegen.xml"/>
- <classpath
refid="maven.dependency.classpath"/>
- <classpath
refid="maven.compile.classpath"/>
- <classpath
refid="maven.runtime.classpath"/>
- </java>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>copy-code</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
-
<source>${basedir}/target/generated/src</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <enableRulesSummary>false</enableRulesSummary>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-</project>
+<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";>
+
+ <parent>
+ <groupId>org.wso2.wsas</groupId>
+ <artifactId>wso2wsas-samples</artifactId>
+ <version>SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wso2wsas-samples-jaxws</artifactId>
+ <packaging>jar</packaging>
+ <name>Sample/JAXWS</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ <!--<resources>
+ <resource>
+ <directory>resources</directory>
+ </resource>
+ </resources>-->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <!--<plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-aar-maven-plugin</artifactId>
+ <version>1.3</version>
+ <extensions>true</extensions>
+ <configuration>
+
<servicesXmlFile>resources/META-INF/services.xml</servicesXmlFile>
+
<wsdlFile>resources/META-INF/CalculatorService.wsdl</wsdlFile>
+ <includeDependencies>false</includeDependencies>
+ </configuration>
+ </plugin>-->
+ <plugin>
+ <inherited>false</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-code</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <java
classname="org.wso2.utils.codegen.CodegenHelper" fork="true">
+ <arg value="./conf/codegen.xml"/>
+ <classpath
refid="maven.dependency.classpath"/>
+ <classpath
refid="maven.compile.classpath"/>
+ <classpath
refid="maven.runtime.classpath"/>
+ </java>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>copy-code</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>${basedir}/target/generated/src</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+</project>
_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
