Author: dkulp
Date: Tue Oct 31 10:27:29 2006
New Revision: 469597
URL: http://svn.apache.org/viewvc?view=rev&rev=469597
Log:
Fix eclipse builds, setup projects for easy addition of generated code to svn
Added:
incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-suppressions.xml
(with props)
incubator/cxf/trunk/rt/frontend/jaxws/src/main/generated/
incubator/cxf/trunk/rt/frontend/jaxws/src/main/generated/org/
incubator/cxf/trunk/rt/frontend/jaxws/src/main/generated/org/apache/
incubator/cxf/trunk/rt/frontend/jaxws/src/main/generated/org/apache/cxf/
incubator/cxf/trunk/rt/frontend/jaxws/src/main/generated/org/apache/cxf/jaxws/
incubator/cxf/trunk/rt/frontend/jaxws/src/main/generated/org/apache/cxf/jaxws/javaee/
- copied from r469558,
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/javaee/
Removed:
incubator/cxf/trunk/rt/frontend/jaxws/checkstyle-suppressions.xml
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/javaee/
Modified:
incubator/cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle
incubator/cxf/trunk/pom.xml
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapInPostInterceptor.java
incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
Added:
incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-suppressions.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-suppressions.xml?view=auto&rev=469597
==============================================================================
---
incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-suppressions.xml
(added)
+++
incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-suppressions.xml
Tue Oct 31 10:27:29 2006
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.0//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd";>
+<!--
+ 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.
+-->
+<suppressions>
+ <suppress checks=".*"
+ files=".+[\\\/]generated[\\\/].+\.java"
+ />
+</suppressions>
\ No newline at end of file
Propchange:
incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-suppressions.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-suppressions.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-suppressions.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
incubator/cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle?view=diff&rev=469597&r1=469596&r2=469597
==============================================================================
--- incubator/cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle
(original)
+++ incubator/cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle
Tue Oct 31 10:27:29 2006
@@ -20,5 +20,7 @@
<fileset-config file-format-version="1.1.0" simple-config="false">
<fileset name="all" enabled="true" check-config-name="CXF Checks"
type="external" description="">
<file-match-pattern match-pattern="^src[/\\]." include-pattern="true"/>
+ <file-match-pattern match-pattern="^src[/\\]main[/\\]generated[/\\]."
include-pattern="false"/>
+ <file-match-pattern match-pattern="^src[/\\]test[/\\]generated[/\\]."
include-pattern="false"/>
</fileset>
</fileset-config>
Modified: incubator/cxf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=469597&r1=469596&r2=469597
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Tue Oct 31 10:27:29 2006
@@ -256,6 +256,7 @@
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
+
<suppressionsLocation>cxf-checkstyle-suppressions.xml</suppressionsLocation>
<sourceDirectory>${basedir}/src</sourceDirectory>
<propertyExpansion>
apache.header.file=${basedir}/${topDirectoryLocation}/etc/apache-header.txt
Modified:
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapInPostInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapInPostInterceptor.java?view=diff&rev=469597&r1=469596&r2=469597
==============================================================================
---
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapInPostInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapInPostInterceptor.java
Tue Oct 31 10:27:29 2006
@@ -32,6 +32,7 @@
import org.apache.cxf.binding.soap.HeaderUtil;
import org.apache.cxf.binding.soap.model.SoapHeaderInfo;
import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
import org.apache.cxf.interceptor.BareInInterceptor;
import org.apache.cxf.interceptor.Fault;
@@ -55,7 +56,7 @@
public void handleMessage(Message message) throws Fault {
Exchange exchange = message.getExchange();
- List<Object> parameters = (List<Object>)
message.getContent(List.class);
+ List<Object> parameters =
CastUtils.cast(message.getContent(List.class));
Endpoint ep = exchange.get(Endpoint.class);
Service service = ep.getService();
Modified: incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/pom.xml?view=diff&rev=469597&r1=469596&r2=469597
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/pom.xml Tue Oct 31 10:27:29 2006
@@ -33,7 +33,7 @@
</parent>
<properties>
- <topDirectoryLocation>../../..</topDirectoryLocation>
+ <topDirectoryLocation>../../..</topDirectoryLocation>
</properties>
<dependencies>
@@ -64,7 +64,7 @@
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-api</artifactId>
@@ -103,81 +103,27 @@
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
+ <build>
+ <plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
- <id>process-sources</id>
- <phase>process-sources</phase>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
<configuration>
-
<suppressionsLocation>${basedir}/checkstyle-suppressions.xml</suppressionsLocation>
+ <sources>
+ <source>${basedir}/src/main/generated</source>
+ </sources>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/javaee/*</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <!--
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-xsd</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
-
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
- <xsdOptions>
- <xsdOption>
-
<xsd>${basedir}/src/main/resources/schemas/configuration/javaee_web_services_1_2.xsd</xsd>
-
<bindingFile>${basedir}/src/main/resources/schemas/configuration/javaee_5.xjb</bindingFile>
- <extension>true</extension>
- <extensionArgs>
- <extensionArg>-Xcfg</extensionArg>
- </extensionArgs>
- </xsdOption>
- </xsdOptions>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-xjc-cfg</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-xjc-dv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- -->
-
- </plugins>
- </pluginManagement>
+ </plugins>
</build>
</project>
