Author: ieb
Date: Mon Dec 15 16:35:28 2008
New Revision: 726894
URL: http://svn.apache.org/viewvc?rev=726894&view=rev
Log:
SHINDIG-725 SHINDIG-789
Combination of 2 patches from Vincent Siveton
Fixes:
Issues with license headers in pom files and some issues over the xsd
declaration.
Correct usage of the incubator legal files
Other formatting issues within the poms
Thanks
Modified:
incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/source.xml
incubator/shindig/branches/1.0.x-incubating/features/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/gadgets/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/server/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml
incubator/shindig/branches/1.0.x-incubating/pom.xml
Modified: incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml?rev=726894&r1=726893&r2=726894&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml Mon Dec 15
16:35:28 2008
@@ -1,3 +1,21 @@
+<?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>
@@ -15,12 +33,15 @@
<description>Assembles the PHP code base into a deployment
package.</description>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/trunk/assembly</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/assembly</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/shindig/trunk/assembly</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/assembly</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/assembly</developerConnection>
+
<url>http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly</url>
</scm>
<build>
+ <filters>
+ <filter>src/main/assembly/binary-src/README</filter>
+ </filters>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -89,4 +110,4 @@
<type>war</type>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified:
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml?rev=726894&r1=726893&r2=726894&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml
(original)
+++
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml
Mon Dec 15 16:35:28 2008
@@ -1,4 +1,21 @@
-<?xml version="1.0"?>
+<?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.
+-->
<assembly>
<id>binary</id>
<formats>
Modified:
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml?rev=726894&r1=726893&r2=726894&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
(original)
+++
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
Mon Dec 15 16:35:28 2008
@@ -1,4 +1,21 @@
-<?xml version="1.0"?>
+<?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.
+-->
<assembly>
<id>php</id>
<formats>
Modified:
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/source.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/source.xml?rev=726894&r1=726893&r2=726894&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/source.xml
(original)
+++
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/source.xml
Mon Dec 15 16:35:28 2008
@@ -1,4 +1,21 @@
-<?xml version="1.0"?>
+<?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.
+-->
<assembly>
<id>source</id>
<formats>
Modified: incubator/shindig/branches/1.0.x-incubating/features/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/features/pom.xml?rev=726894&r1=726893&r2=726894&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/features/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/features/pom.xml Mon Dec 15
16:35:28 2008
@@ -1,3 +1,21 @@
+<?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>
@@ -139,15 +157,6 @@
<exclude>target/**</exclude>
</excludes>
</resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}/../</directory>
- <includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- <include>DISCLAIMER</include>
- </includes>
- </resource>
</resources>
</build>
Modified: incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml?rev=726894&r1=726893&r2=726894&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml Mon Dec 15
16:35:28 2008
@@ -1,21 +1,20 @@
-<?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.
+<?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>
@@ -57,15 +56,6 @@
<resource>
<directory>conf</directory>
</resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}/../../</directory>
- <includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- <include>DISCLAIMER</include>
- </includes>
- </resource>
</resources>
</build>
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/pom.xml?rev=726894&r1=726893&r2=726894&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/pom.xml Mon Dec 15
16:35:28 2008
@@ -1,21 +1,20 @@
-<?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.
+<?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>
@@ -95,15 +94,6 @@
<include>oauth.json</include>
</includes>
</resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}/../../</directory>
- <includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- <include>DISCLAIMER</include>
- </includes>
- </resource>
</resources>
</build>
Modified: incubator/shindig/branches/1.0.x-incubating/java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/pom.xml?rev=726894&r1=726893&r2=726894&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/pom.xml Mon Dec 15
16:35:28 2008
@@ -1,21 +1,20 @@
-<?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.
+<?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>
Modified: incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml?rev=726894&r1=726893&r2=726894&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml Mon Dec 15
16:35:28 2008
@@ -1,21 +1,20 @@
-<?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.
+<?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>
@@ -34,9 +33,9 @@
<description>Provides Sample implementations of the SPI and API's inside the
core of Shindig.</description>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/trunk/java/samples</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/java/samples</developerConnection>
-
<url>http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java/samples</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java/samples</developerConnection>
+
<url>http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples</url>
</scm>
<repositories>
@@ -53,15 +52,6 @@
<include>**/*</include>
</includes>
</resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}/../../</directory>
- <includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- <include>DISCLAIMER</include>
- </includes>
- </resource>
</resources>
</build>
<dependencies>
Modified: incubator/shindig/branches/1.0.x-incubating/java/server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/server/pom.xml?rev=726894&r1=726893&r2=726894&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/server/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/server/pom.xml Mon Dec 15
16:35:28 2008
@@ -1,21 +1,20 @@
-<?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.
+<?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>
@@ -53,18 +52,16 @@
<resource>
<!-- this is relative to the pom.xml directory -->
<directory>${basedir}/../../javascript/</directory>
- <targetPath>/gadgets/files</targetPath>
+ <targetPath>gadgets/files</targetPath>
<includes>
<include>**/*.*</include>
</includes>
</resource>
<resource>
<targetPath>META-INF</targetPath>
- <directory>${basedir}/../../</directory>
+
<directory>${build.directory}/maven-shared-archive-resources/META-INF</directory>
<includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- <include>DISCLAIMER</include>
+ <include>**/*</include>
</includes>
</resource>
</webResources>
@@ -83,7 +80,7 @@
<resources>
<resource>
<directory>${basedir}/../../javascript/</directory>
- <targetPath>/gadgets/files</targetPath>
+ <targetPath>gadgets/files</targetPath>
<includes>
<include>**/*.*</include>
</includes>
@@ -105,15 +102,6 @@
<resource>
<directory>conf</directory>
</resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}/../../</directory>
- <includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- <include>DISCLAIMER</include>
- </includes>
- </resource>
</resources>
</build>
Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml?rev=726894&r1=726893&r2=726894&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml
(original)
+++ incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml Mon Dec
15 16:35:28 2008
@@ -1,21 +1,20 @@
-<?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.
+<?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>
@@ -51,15 +50,6 @@
<include>**/*.*</include>
</includes>
</resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}/../../</directory>
- <includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- <include>DISCLAIMER</include>
- </includes>
- </resource>
</resources>
</build>
Modified: incubator/shindig/branches/1.0.x-incubating/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/pom.xml?rev=726894&r1=726893&r2=726894&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/pom.xml Mon Dec 15 16:35:28 2008
@@ -537,6 +537,11 @@
<defaultGoal>install</defaultGoal>
<plugins>
+ <!-- We want to package up license resources in the JARs produced -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>tools-maven-plugin</artifactId>
@@ -681,6 +686,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<goals>
@@ -689,6 +695,7 @@
<configuration>
<resourceBundles>
<resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+
<resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
</resourceBundles>
</configuration>
</execution>
@@ -740,11 +747,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-alpha-6</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>2.0-beta-6</version>
</plugin>
