maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r685440 - in /maven/shared/branches/sisbell-maven-shared-model-profile: ./ maven-ant/ maven-app-configuration/ maven-app-configuration/model/ maven-app-configuration/web/ maven-common-artifact-filters/ maven-downloader/ maven-osgi/ maven-re...
Date Wed, 13 Aug 2008 04:52:15 GMT
Author: sisbell
Date: Tue Aug 12 21:52:13 2008
New Revision: 685440

URL: http://svn.apache.org/viewvc?rev=685440&view=rev
Log:
Merge of shared trunk to branch.

Modified:
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-ant/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/model/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/web/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-common-artifact-filters/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-downloader/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-osgi/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-reporting-impl/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-repository-builder/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/maven-script-ant/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/maven-script-beanshell/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ImportModel.java
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainerFactory.java
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelPropertyTransformer.java
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/XmlImportModel.java
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-monitor/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-web-ui-tests/pom.xml
    maven/shared/branches/sisbell-maven-shared-model-profile/pom.xml

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-ant/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-ant/pom.xml (original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-ant/pom.xml Tue Aug 12
21:52:13 2008
@@ -1,4 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?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">
   <parent>
     <artifactId>maven-shared-components</artifactId>
     <groupId>org.apache.maven.shared</groupId>    

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/model/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/model/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/model/pom.xml
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/model/pom.xml
Tue Aug 12 21:52:13 2008
@@ -1,4 +1,23 @@
-<?xml version="1.0"?><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">
+<?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">
   <parent>
     <artifactId>maven-app-configuration</artifactId>
     <groupId>org.apache.maven.shared</groupId>

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/pom.xml
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/pom.xml
Tue Aug 12 21:52:13 2008
@@ -1,4 +1,22 @@
 <?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">
   <parent>
     <artifactId>maven-shared-components</artifactId>

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/web/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/web/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/web/pom.xml
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-app-configuration/web/pom.xml
Tue Aug 12 21:52:13 2008
@@ -1,4 +1,23 @@
-<?xml version="1.0"?><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">
+<?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">
   <parent>
     <artifactId>maven-app-configuration</artifactId>
     <groupId>org.apache.maven.shared</groupId>

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-common-artifact-filters/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-common-artifact-filters/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-common-artifact-filters/pom.xml
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-common-artifact-filters/pom.xml
Tue Aug 12 21:52:13 2008
@@ -1,3 +1,22 @@
+<?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">
   <parent>
     <artifactId>maven-shared-components</artifactId>

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-downloader/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-downloader/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-downloader/pom.xml (original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-downloader/pom.xml Tue
Aug 12 21:52:13 2008
@@ -1,4 +1,23 @@
-<?xml version="1.0"?><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">
+<?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">
   <parent>
     <artifactId>maven-shared-components</artifactId>
     <groupId>org.apache.maven.shared</groupId>

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-osgi/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-osgi/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-osgi/pom.xml (original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-osgi/pom.xml Tue Aug 12
21:52:13 2008
@@ -16,9 +16,7 @@
  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">
+<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.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-reporting-impl/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-reporting-impl/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-reporting-impl/pom.xml
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-reporting-impl/pom.xml
Tue Aug 12 21:52:13 2008
@@ -17,8 +17,7 @@
   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">
+<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.maven.shared</groupId>

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-repository-builder/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-repository-builder/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-repository-builder/pom.xml
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-repository-builder/pom.xml
Tue Aug 12 21:52:13 2008
@@ -1,3 +1,22 @@
+<?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>

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/maven-script-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/maven-script-ant/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/maven-script-ant/pom.xml
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/maven-script-ant/pom.xml
Tue Aug 12 21:52:13 2008
@@ -19,8 +19,7 @@
 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">
+<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>
     <artifactId>maven-script</artifactId>
     <groupId>org.apache.maven</groupId>

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/maven-script-beanshell/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/maven-script-beanshell/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/maven-script-beanshell/pom.xml
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/maven-script-beanshell/pom.xml
Tue Aug 12 21:52:13 2008
@@ -19,8 +19,7 @@
 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">
+<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>
     <artifactId>maven-script</artifactId>
     <groupId>org.apache.maven</groupId>

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/pom.xml (original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-script/pom.xml Tue Aug
12 21:52:13 2008
@@ -19,8 +19,7 @@
 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">
+<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>
     <artifactId>maven-shared-components</artifactId>
     <groupId>org.apache.maven.shared</groupId>

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/pom.xml (original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/pom.xml Tue
Aug 12 21:52:13 2008
@@ -19,8 +19,7 @@
 under the License.
 -->
 
-<project 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">
+<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.maven.shared</groupId>

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java
Tue Aug 12 21:52:13 2008
@@ -22,7 +22,7 @@
 import java.io.IOException;
 
 /**
- * Exeception class whose instance is thrown if there is an illegal state within a data source.
+ * Exception class whose instance is thrown if there is an illegal state within a data source.
  */
 public class DataSourceException
     extends IOException

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ImportModel.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ImportModel.java?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ImportModel.java
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ImportModel.java
Tue Aug 12 21:52:13 2008
@@ -1,5 +1,24 @@
 package org.apache.maven.shared.model;
 
+/*
+ * 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.
+ */
+
 import java.util.List;
 
 public interface ImportModel {

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainerFactory.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainerFactory.java?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainerFactory.java
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainerFactory.java
Tue Aug 12 21:52:13 2008
@@ -30,9 +30,9 @@
 {
 
     /**
-     * Returns collection of URIs asscociated with this factory.
+     * Returns collection of URIs associated with this factory.
      *
-     * @return collection of URIs asscociated with this factory
+     * @return collection of URIs associated with this factory
      */
     Collection<String> getUris();
 

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java
Tue Aug 12 21:52:13 2008
@@ -30,7 +30,7 @@
 
     /**
      * Join model properties of the specified container a with the specified container b.
Any elements of model container
-     * a must take precendence over model container b. All elements of model container A
must exist in the data source;
+     * a must take precedence over model container b. All elements of model container A must
exist in the data source;
      * elements of model container b may or may not exist.
      *
      * @param a model container with precedence

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
Tue Aug 12 21:52:13 2008
@@ -72,7 +72,7 @@
 
         if ( collections == null )
         {
-            collections = Collections.EMPTY_SET;
+            collections = Collections.emptySet();
         }
 
         List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelPropertyTransformer.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelPropertyTransformer.java?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelPropertyTransformer.java
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelPropertyTransformer.java
Tue Aug 12 21:52:13 2008
@@ -1,5 +1,24 @@
 package org.apache.maven.shared.model;
 
+/*
+ * 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.
+ */
+
 import java.util.List;
 
 public interface ModelPropertyTransformer {

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
Tue Aug 12 21:52:13 2008
@@ -63,7 +63,14 @@
      */
     public ModelTransformerContext( Collection<ModelContainerFactory> factories )
     {
-        this.factories = ( factories == null ) ? Collections.EMPTY_LIST : factories;
+        if ( factories == null )
+        {
+            this.factories = Collections.emptyList();
+        }
+        else
+        {
+            this.factories = factories;
+        }
     }
 
     /**

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
Tue Aug 12 21:52:13 2008
@@ -187,7 +187,7 @@
 
         if ( modelProperties.isEmpty() )
         {
-            return Collections.EMPTY_LIST;
+            return Collections.emptyList();
         }
 
         ModelContainerFactory factory = modelContainerFactoryMap.get( uri );

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/XmlImportModel.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/XmlImportModel.java?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/XmlImportModel.java
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/XmlImportModel.java
Tue Aug 12 21:52:13 2008
@@ -1,5 +1,24 @@
 package org.apache.maven.shared.model.impl;
 
+/*
+ * 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.
+ */
+
 import org.apache.maven.shared.model.ImportModel;
 import org.apache.maven.shared.model.ModelProperty;
 import org.apache.maven.shared.model.ModelMarshaller;

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-monitor/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-monitor/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-monitor/pom.xml
(original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-monitor/pom.xml
Tue Aug 12 21:52:13 2008
@@ -17,8 +17,7 @@
   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">
+<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.maven.shared</groupId>

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-web-ui-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-web-ui-tests/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-web-ui-tests/pom.xml (original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-web-ui-tests/pom.xml Tue
Aug 12 21:52:13 2008
@@ -17,8 +17,7 @@
   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">
+<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.maven.shared</groupId>

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/pom.xml?rev=685440&r1=685439&r2=685440&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/pom.xml (original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/pom.xml Tue Aug 12 21:52:13 2008
@@ -17,7 +17,7 @@
  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"
xsi:noNamespaceSchemaLocation="http://maven.apache.org/maven-v4_0_0.xsd">
+<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>
@@ -70,6 +70,11 @@
     <module>maven-shared-monitor</module>
     <module>maven-verifier</module>
     <module>maven-web-ui-tests</module>
+    <!--
+           Uses jdk 1.5
+            <modlue>maven-shared-model</modlue>
+            
+            -->
   </modules>
 
   <scm>



Mime
View raw message