You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2011/12/22 06:54:53 UTC
svn commit: r1222072 [9/13] - in /incubator/npanday/trunk: ./
components/dotnet-executable/src/main/java/npanday/executable/
components/dotnet-executable/src/main/java/npanday/executable/compiler/
components/dotnet-executable/src/main/java/npanday/exec...
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/RenameWebReferenceTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/RenameWebReferenceTest.cs?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/RenameWebReferenceTest.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/RenameWebReferenceTest.cs Thu Dec 22 06:54:49 2011
@@ -1,90 +1,90 @@
-#region Apache License, Version 2.0
-//
-// 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.
-//
-#endregion
-
-using System;
-using System.Text;
-using NUnit.Framework;
-using System.IO;
-using NPanday.Utils;
-
-namespace NPanday.VisualStudio.Addin_Test
-{
- [TestFixture]
- public class RenameWebReferenceTest
- {
- private PomHelperUtility pomCopy;
- private String pomPath;
- private String pomCopyPath;
- private String fullPath;
- private String fullPathCopy;
- private String path;
- private String output;
- private String oldName = "WebRef";
- private String newName = "WebRef2";
-
- private StringBuilder strLine;
- private String line;
- private StreamReader strm;
-
- public RenameWebReferenceTest()
- {
- pomPath = (new FileInfo(Directory.GetCurrentDirectory().Substring(0, Directory.GetCurrentDirectory().LastIndexOf("target")) + "\\src\\test\\resource\\ClassLibrary1\\ClassLibrary1\\pom.xml").FullName);
-
- pomCopyPath = pomPath.Replace("pom.xml", "pomCopy.xml");
-
- pomCopy = new PomHelperUtility(pomCopyPath);
-
- File.Copy(pomPath, pomCopyPath);
-
- fullPath = (new FileInfo(Directory.GetCurrentDirectory().Substring(0, Directory.GetCurrentDirectory().LastIndexOf("target")) + "\\src\\test\\resource\\ClassLibrary1\\ClassLibrary1\\Web References\\WebRef").FullName);
- fullPathCopy = fullPath.Replace(oldName, newName);
- path = "Web References\\" + oldName + "\\demoService.wsdl";
- }
-
- [Test]
- public void RenameExistingWebReferenceTest()
- {
- int ctr = 0;
-
- pomCopy.RenameWebReference(fullPath, oldName, newName, path, output);
-
- strm = new StreamReader(pomCopyPath);
- strLine = new StringBuilder();
-
- while ((line = strm.ReadLine()) != null)
- {
- strLine.Append(line);
-
- if (line.ToString().Contains("<webreference>"))
- {
- ctr++;
- }
- }
-
- strm.Close();
- File.Delete(pomCopyPath);
-
- Assert.AreEqual(1, ctr);
- Assert.IsFalse(strLine.ToString().Contains("<namespace>WebRef</namespace>"));
- }
-
- }
-}
+#region Apache License, Version 2.0
+//
+// 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.
+//
+#endregion
+
+using System;
+using System.Text;
+using NUnit.Framework;
+using System.IO;
+using NPanday.Utils;
+
+namespace NPanday.VisualStudio.Addin_Test
+{
+ [TestFixture]
+ public class RenameWebReferenceTest
+ {
+ private PomHelperUtility pomCopy;
+ private String pomPath;
+ private String pomCopyPath;
+ private String fullPath;
+ private String fullPathCopy;
+ private String path;
+ private String output;
+ private String oldName = "WebRef";
+ private String newName = "WebRef2";
+
+ private StringBuilder strLine;
+ private String line;
+ private StreamReader strm;
+
+ public RenameWebReferenceTest()
+ {
+ pomPath = (new FileInfo(Directory.GetCurrentDirectory().Substring(0, Directory.GetCurrentDirectory().LastIndexOf("target")) + "\\src\\test\\resource\\ClassLibrary1\\ClassLibrary1\\pom.xml").FullName);
+
+ pomCopyPath = pomPath.Replace("pom.xml", "pomCopy.xml");
+
+ pomCopy = new PomHelperUtility(pomCopyPath);
+
+ File.Copy(pomPath, pomCopyPath);
+
+ fullPath = (new FileInfo(Directory.GetCurrentDirectory().Substring(0, Directory.GetCurrentDirectory().LastIndexOf("target")) + "\\src\\test\\resource\\ClassLibrary1\\ClassLibrary1\\Web References\\WebRef").FullName);
+ fullPathCopy = fullPath.Replace(oldName, newName);
+ path = "Web References\\" + oldName + "\\demoService.wsdl";
+ }
+
+ [Test]
+ public void RenameExistingWebReferenceTest()
+ {
+ int ctr = 0;
+
+ pomCopy.RenameWebReference(fullPath, oldName, newName, path, output);
+
+ strm = new StreamReader(pomCopyPath);
+ strLine = new StringBuilder();
+
+ while ((line = strm.ReadLine()) != null)
+ {
+ strLine.Append(line);
+
+ if (line.ToString().Contains("<webreference>"))
+ {
+ ctr++;
+ }
+ }
+
+ strm.Close();
+ File.Delete(pomCopyPath);
+
+ Assert.AreEqual(1, ctr);
+ Assert.IsFalse(strLine.ToString().Contains("<namespace>WebRef</namespace>"));
+ }
+
+ }
+}
Propchange: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/RenameWebReferenceTest.cs
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/ResyncArtifactSnapshot.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/ResyncArtifactSnapshot.cs?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/ResyncArtifactSnapshot.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/ResyncArtifactSnapshot.cs Thu Dec 22 06:54:49 2011
@@ -1,52 +1,52 @@
-#region Apache License, Version 2.0
-//
-// 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.
-//
-#endregion
-
-using NUnit.Framework;
-using NPanday.VisualStudio.Addin;
-using System.IO;
-
-namespace NPanday.VisualStudio.Addin_Test
-{
- [TestFixture]
- public class ResyncArtifactSnapshot
- {
- public void artifactSetUp()
- {
- ReferenceManager refMngr = new ReferenceManager();
- Artifact.Artifact artifact = new Artifact.Artifact();
-
- artifact.GroupId = "npanday.artifact";
- artifact.Version = "1.1-SNAPSHOT";
- artifact.ArtifactId = "NPanday.Artifact";
- artifact.Extension = "dll";
-
- refMngr.CopyArtifact(artifact,null);
- }
-
- [Test]
- public void downloadArtifact()
- {
- string user = System.Security.Principal.WindowsIdentity.GetCurrent().Name.ToString();
- Assert.IsNotNull(new FileInfo(string.Format("C:\\Documents and Settings\\{0}\\.m2\\uac\\gac_msil\\npanday.artifact\\1.1-SNAPSHOT__npanday.artifact\\NPanday.Artifact.dll", user)));
- }
-
- }
-}
+#region Apache License, Version 2.0
+//
+// 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.
+//
+#endregion
+
+using NUnit.Framework;
+using NPanday.VisualStudio.Addin;
+using System.IO;
+
+namespace NPanday.VisualStudio.Addin_Test
+{
+ [TestFixture]
+ public class ResyncArtifactSnapshot
+ {
+ public void artifactSetUp()
+ {
+ ReferenceManager refMngr = new ReferenceManager();
+ Artifact.Artifact artifact = new Artifact.Artifact();
+
+ artifact.GroupId = "npanday.artifact";
+ artifact.Version = "1.1-SNAPSHOT";
+ artifact.ArtifactId = "NPanday.Artifact";
+ artifact.Extension = "dll";
+
+ refMngr.CopyArtifact(artifact,null);
+ }
+
+ [Test]
+ public void downloadArtifact()
+ {
+ string user = System.Security.Principal.WindowsIdentity.GetCurrent().Name.ToString();
+ Assert.IsNotNull(new FileInfo(string.Format("C:\\Documents and Settings\\{0}\\.m2\\uac\\gac_msil\\npanday.artifact\\1.1-SNAPSHOT__npanday.artifact\\NPanday.Artifact.dll", user)));
+ }
+
+ }
+}
Propchange: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/ResyncArtifactSnapshot.cs
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/SuccessfulDisconnectTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/SuccessfulDisconnectTest.cs?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/SuccessfulDisconnectTest.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/SuccessfulDisconnectTest.cs Thu Dec 22 06:54:49 2011
@@ -1,54 +1,54 @@
-#region Apache License, Version 2.0
-//
-// 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.
-//
-#endregion
-
-using System;
-using NUnit.Framework;
-using NPanday.VisualStudio.Addin;
-using Extensibility;
-
-namespace NPanday.VisualStudio.Addin_Test
-{
- [TestFixture]
- public class SuccessfulDisconnectTest
- {
- public class ConnectTest : Connect
- {
- public bool IsNpandayDisconnected()
- {
- return this.IsApplicationObjectNull();
- }
- }
-
- [Test]
- public void CheckCleanDisconnectTest()
- {
- ConnectTest npandayConnect = new ConnectTest();
-
- ext_DisconnectMode disconnectMode = ext_DisconnectMode.ext_dm_HostShutdown;
- Object[] holder = { "" };
- Array custom = (Array)holder;
-
- npandayConnect.OnDisconnection(disconnectMode, ref custom);
-
- Assert.AreEqual(true, npandayConnect.IsNpandayDisconnected());
- }
- }
-}
+#region Apache License, Version 2.0
+//
+// 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.
+//
+#endregion
+
+using System;
+using NUnit.Framework;
+using NPanday.VisualStudio.Addin;
+using Extensibility;
+
+namespace NPanday.VisualStudio.Addin_Test
+{
+ [TestFixture]
+ public class SuccessfulDisconnectTest
+ {
+ public class ConnectTest : Connect
+ {
+ public bool IsNpandayDisconnected()
+ {
+ return this.IsApplicationObjectNull();
+ }
+ }
+
+ [Test]
+ public void CheckCleanDisconnectTest()
+ {
+ ConnectTest npandayConnect = new ConnectTest();
+
+ ext_DisconnectMode disconnectMode = ext_DisconnectMode.ext_dm_HostShutdown;
+ Object[] holder = { "" };
+ Array custom = (Array)holder;
+
+ npandayConnect.OnDisconnection(disconnectMode, ref custom);
+
+ Assert.AreEqual(true, npandayConnect.IsNpandayDisconnected());
+ }
+ }
+}
Propchange: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/SuccessfulDisconnectTest.cs
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/pom.xml?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/pom.xml (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/pom.xml Thu Dec 22 06:54:49 2011
@@ -1,89 +1,89 @@
-<?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>
- <groupId>org.apache.npanday.plugins</groupId>
- <version>1.5.0-incubating-SNAPSHOT</version>
- <artifactId>maven-dotnet-plugins</artifactId>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>aspnet-maven-plugin</artifactId>
- <packaging>maven-plugin</packaging>
- <name>NPanday :: ASP.NET Maven Plugin</name>
- <description>Maven Plugin for .NET: Support for ASP.NET web projects and applications</description>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>${plexus.utils.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>run-its</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>1.5</version>
- <configuration>
- <projectsDirectory>src/it</projectsDirectory>
- <cloneProjectsTo>target/it</cloneProjectsTo>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <!-- Can't use localRepositoryPath or -Dmaven.repo.local with NPanday
- See https://issues.apache.org/jira/browse/NPANDAY-284
- <localRepositoryPath>target/local-repo</localRepositoryPath> -->
- <postBuildHookScript>verify</postBuildHookScript>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</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>
+ <groupId>org.apache.npanday.plugins</groupId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ <artifactId>maven-dotnet-plugins</artifactId>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>aspnet-maven-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>NPanday :: ASP.NET Maven Plugin</name>
+ <description>Maven Plugin for .NET: Support for ASP.NET web projects and applications</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>${plexus.utils.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>run-its</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.5</version>
+ <configuration>
+ <projectsDirectory>src/it</projectsDirectory>
+ <cloneProjectsTo>target/it</cloneProjectsTo>
+ <pomIncludes>
+ <pomInclude>*/pom.xml</pomInclude>
+ </pomIncludes>
+ <!-- Can't use localRepositoryPath or -Dmaven.repo.local with NPanday
+ See https://issues.apache.org/jira/browse/NPANDAY-284
+ <localRepositoryPath>target/local-repo</localRepositoryPath> -->
+ <postBuildHookScript>verify</postBuildHookScript>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/goals.txt
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/goals.txt?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/goals.txt (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/goals.txt Thu Dec 22 06:54:49 2011
@@ -1 +1 @@
-clean prepare-package
+clean prepare-package
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/pom.xml?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/pom.xml (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/pom.xml Thu Dec 22 06:54:49 2011
@@ -1,48 +1,48 @@
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>@project.groupId@.@project.artifactId@-its</groupId>
- <artifactId>IT001_AssembleWithZeroConfig</artifactId>
- <version>@project.version@</version>
- <packaging>pom</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>assemble</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>assemble-package-files</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>@project.groupId@.@project.artifactId@-its</groupId>
+ <artifactId>IT001_AssembleWithZeroConfig</artifactId>
+ <version>@project.version@</version>
+ <packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>@project.groupId@</groupId>
+ <artifactId>@project.artifactId@</artifactId>
+ <version>@project.version@</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>assemble-package-files</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/verify.groovy
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/verify.groovy?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/verify.groovy (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/verify.groovy Thu Dec 22 06:54:49 2011
@@ -1,27 +1,27 @@
-/*
-* 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.
-*/
-def packageDir = new File(basedir, "target\\packages\\IT001_AssembleWithZeroConfig")
-assert packageDir.exists()
-assert new File(packageDir, "please-copy.aspx").exists();
-assert !new File(packageDir, "do-not-copy.sql").exists();
-
-assert new File(packageDir, "deep\\deeper\\please-copy.aspx").exists();
-assert !new File(packageDir, "deep\\deeper\\do-not-copy.sql").exists();
-
-return true;
+/*
+* 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.
+*/
+def packageDir = new File(basedir, "target\\packages\\IT001_AssembleWithZeroConfig")
+assert packageDir.exists()
+assert new File(packageDir, "please-copy.aspx").exists();
+assert !new File(packageDir, "do-not-copy.sql").exists();
+
+assert new File(packageDir, "deep\\deeper\\please-copy.aspx").exists();
+assert !new File(packageDir, "deep\\deeper\\do-not-copy.sql").exists();
+
+return true;
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT001_AssembleWithZeroConfig/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/custom-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/custom-assembly.xml?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/custom-assembly.xml (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/custom-assembly.xml Thu Dec 22 06:54:49 2011
@@ -1,19 +1,19 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>custom-assembly</id>
- <includeBaseDirectory>false</includeBaseDirectory>
- <formats>
- <format>dir</format>
- </formats>
- <fileSets>
- <fileSet>
- <useDefaultExcludes>true</useDefaultExcludes>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>please-copy.aspx</include>
- </includes>
- </fileSet>
- </fileSets>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>custom-assembly</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>please-copy.aspx</include>
+ </includes>
+ </fileSet>
+ </fileSets>
</assembly>
\ No newline at end of file
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/custom-assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/goals.txt
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/goals.txt?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/goals.txt (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/goals.txt Thu Dec 22 06:54:49 2011
@@ -1 +1 @@
-clean prepare-package
+clean prepare-package
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/pom.xml?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/pom.xml (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/pom.xml Thu Dec 22 06:54:49 2011
@@ -1,51 +1,51 @@
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>@project.groupId@.@project.artifactId@-its</groupId>
- <artifactId>IT002_UserDefinedAssemblyDescriptor</artifactId>
- <version>@project.version@</version>
- <packaging>pom</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>default-package</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>assemble-package-files</goal>
- </goals>
- <configuration>
- <assemblyDescriptor>custom-assembly.xml</assemblyDescriptor>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>@project.groupId@.@project.artifactId@-its</groupId>
+ <artifactId>IT002_UserDefinedAssemblyDescriptor</artifactId>
+ <version>@project.version@</version>
+ <packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>@project.groupId@</groupId>
+ <artifactId>@project.artifactId@</artifactId>
+ <version>@project.version@</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>default-package</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>assemble-package-files</goal>
+ </goals>
+ <configuration>
+ <assemblyDescriptor>custom-assembly.xml</assemblyDescriptor>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/verify.groovy
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/verify.groovy?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/verify.groovy (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/verify.groovy Thu Dec 22 06:54:49 2011
@@ -1,24 +1,24 @@
-/*
-* 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.
-*/
-def packageDir = new File(basedir, "target\\packages\\IT002_UserDefinedAssemblyDescriptor")
-assert packageDir.exists()
-assert new File(packageDir, "please-copy.aspx").exists();
-assert !new File(packageDir, "do-not-copy.aspx").exists();
-
-return true;
+/*
+* 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.
+*/
+def packageDir = new File(basedir, "target\\packages\\IT002_UserDefinedAssemblyDescriptor")
+assert packageDir.exists()
+assert new File(packageDir, "please-copy.aspx").exists();
+assert !new File(packageDir, "do-not-copy.aspx").exists();
+
+return true;
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT002_UserDefinedAssemblyDescriptor/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/copy-also.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/custom-assembly-component.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/custom-assembly-component.xml?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/custom-assembly-component.xml (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/custom-assembly-component.xml Thu Dec 22 06:54:49 2011
@@ -1,13 +1,13 @@
-<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
- <fileSets>
- <fileSet>
- <useDefaultExcludes>true</useDefaultExcludes>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>copy-also.txt</include>
- </includes>
- </fileSet>
- </fileSets>
+<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
+ <fileSets>
+ <fileSet>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>copy-also.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
</component>
\ No newline at end of file
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/custom-assembly-component.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/goals.txt
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/goals.txt?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/goals.txt (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/goals.txt Thu Dec 22 06:54:49 2011
@@ -1 +1 @@
-clean prepare-package
+clean prepare-package
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/pom.xml?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/pom.xml (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/pom.xml Thu Dec 22 06:54:49 2011
@@ -1,53 +1,53 @@
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>@project.groupId@.@project.artifactId@-its</groupId>
- <artifactId>IT003_AdditionalComponents</artifactId>
- <version>@project.version@</version>
- <packaging>pom</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>default-package</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>assemble-package-files</goal>
- </goals>
- <configuration>
- <mixinAssemblyComponentDescriptors>
- <mixinAssemblyComponentDescriptor>custom-assembly-component.xml</mixinAssemblyComponentDescriptor>
- </mixinAssemblyComponentDescriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>@project.groupId@.@project.artifactId@-its</groupId>
+ <artifactId>IT003_AdditionalComponents</artifactId>
+ <version>@project.version@</version>
+ <packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>@project.groupId@</groupId>
+ <artifactId>@project.artifactId@</artifactId>
+ <version>@project.version@</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>default-package</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>assemble-package-files</goal>
+ </goals>
+ <configuration>
+ <mixinAssemblyComponentDescriptors>
+ <mixinAssemblyComponentDescriptor>custom-assembly-component.xml</mixinAssemblyComponentDescriptor>
+ </mixinAssemblyComponentDescriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/verify.groovy
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/verify.groovy?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/verify.groovy (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/verify.groovy Thu Dec 22 06:54:49 2011
@@ -1,24 +1,24 @@
-/*
-* 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.
-*/
-def packageDir = new File(basedir, "target\\packages\\IT003_AdditionalComponents")
-assert packageDir.exists()
-assert new File(packageDir, "copy-anyway.aspx").exists();
-assert new File(packageDir, "copy-also.txt").exists();
-
-return true;
+/*
+* 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.
+*/
+def packageDir = new File(basedir, "target\\packages\\IT003_AdditionalComponents")
+assert packageDir.exists()
+assert new File(packageDir, "copy-anyway.aspx").exists();
+assert new File(packageDir, "copy-also.txt").exists();
+
+return true;
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/it/IT003_AdditionalComponents/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/aspnet/AssemblePackageFilesMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/aspnet/AssemblePackageFilesMojo.java?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/aspnet/AssemblePackageFilesMojo.java (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/aspnet/AssemblePackageFilesMojo.java Thu Dec 22 06:54:49 2011
@@ -1,221 +1,221 @@
-package npanday.plugin.aspnet;
-
-/*
- * 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 com.google.common.base.Objects;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.AssemblyArchiver;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.io.AssemblyReadException;
-import org.apache.maven.plugin.assembly.io.AssemblyReader;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.shared.filtering.MavenFileFilter;
-
-import java.util.List;
-
-import static com.google.common.base.Strings.*;
-import static com.google.common.collect.Iterables.toArray;
-
-/**
- * Maven Mojo preparing the packaging of ASP.NET web applications.
- *
- * @author <a href="mailto:lcorneliussen@apache.org">Lars Corneliussen</a>
- * @goal assemble-package-files
- * @description Maven Mojo for preparing the packaging of ASP.NET web applications
- * @since 1.5.0-incubating
- */
-public class AssemblePackageFilesMojo
- extends AbstractMojo
-{
- Splitter COMMANDLINE_LISTS_SPLITTER = Splitter.on( "," ).omitEmptyStrings().trimResults();
-
- /**
- * @parameter expression="${assemblyDescriptor}"
- * @description Assembly XML Descriptor file. This must be the path to your customized descriptor file.
- * <br><b>assemblyDescriptor will take precedence over {@see assemblyDescriptorRef}</b>
- */
- private String assemblyDescriptor;
-
- /**
- * @parameter expression="${mixinAssemblyComponentDescriptorList}"
- * @description Commandline version of {@see mixinAssemblyComponentDescriptors}. Spearate each item with a comma.
- */
- private String mixinAssemblyComponentDescriptorList;
-
- /**
- * @parameter
- * @description Component descriptors to be mixed into the main assembly descriptor from
- * {@see assemblyDescriptorRef} or {@see assemblyDescriptor}.
- * <br/>This is particularly useful, when the assembly descriptor is provided via the classpath.
- */
- private String[] mixinAssemblyComponentDescriptors;
-
- /**
- * @parameter expression="${assemblyDescriptorRef}" default-value="aspnet-webapp-defaults"
- * @description A references to an assembly descriptor available on the plugin's classpath. The default
- * classpath includes these built-in descriptors. You can add others by adding dependencies to the plugin.
- * <br><b>assemblyDescriptorRef will be ignored, if {@see assemblyDescriptor} is configured</b>
- */
- private String assemblyDescriptorRef;
-
- /**
- * The Maven Session Object providing both the
- * current project and the local repository.
- *
- * @parameter default-value="${session}"
- * @required
- * @readonly
- */
- private MavenSession mavenSession;
-
- /**
- * @component
- */
- private MixinAsssemblyReader assemblyReader;
-
- /**
- * @component
- */
- private AssemblyArchiver assemblyArchiver;
-
- /**
- * @component
- */
- private MavenFileFilter fileFilter;
-
-
- public void execute()
- throws MojoExecutionException, MojoFailureException
- {
- long startTime = System.currentTimeMillis();
-
- setupParameters();
-
- final PackagePreparationConfigurationSource packageConfig =
- new PackagePreparationConfigurationSource( mavenSession, fileFilter );
-
- if ( !isNullOrEmpty( assemblyDescriptor ) )
- {
- packageConfig.setDescriptorFile( assemblyDescriptor );
- }
- else if ( !isNullOrEmpty( assemblyDescriptorRef ) )
- {
- packageConfig.setDescriptorRef( assemblyDescriptorRef );
- }
- else
- {
- throw new MojoFailureException( "NPANDAY-109-008: Please configure either assemblyDescriptorRef or assemblyDescriptor" );
- }
-
- assemblyReader.setComponentDescriptors( Objects.firstNonNull( mixinAssemblyComponentDescriptors, new String[0] ));
-
- createPackage( packageConfig );
-
- long endTime = System.currentTimeMillis();
- getLog().debug( "Mojo Execution Time = " + ( endTime - startTime ) );
- }
-
- /**
- * Copies from commandline parameters to "real" parameters.
- */
- private void setupParameters()
- {
- if ( !isNullOrEmpty( mixinAssemblyComponentDescriptorList ) )
- {
- mixinAssemblyComponentDescriptors =
- toArray( COMMANDLINE_LISTS_SPLITTER.split( mixinAssemblyComponentDescriptorList ), String.class );
- }
- }
-
- public void createPackage( AssemblerConfigurationSource configurationSource )
- throws MojoExecutionException, MojoFailureException
- {
- List<Assembly> assemblies;
- try
- {
- assemblies = assemblyReader.readAssemblies( configurationSource );
- }
- catch ( final AssemblyReadException e )
- {
- throw new MojoExecutionException( "NPANDAY-109-001: Error reading assembly descriptors: " + e.getMessage(),
- e );
- }
- catch ( final InvalidAssemblerConfigurationException e )
- {
- throw new MojoFailureException( assemblyReader, e.getMessage(),
- "NPANDAY-109-002: Mojo configuration is invalid: " + e.getMessage() );
- }
-
- if ( assemblies.size() == 0 )
- {
- throw new MojoExecutionException(
- "NPANDAY-109-003: Somehow the assembly reader couldn't find the configured assembly descriptor" );
- }
-
- if ( assemblies.size() > 1 )
- {
- throw new MojoExecutionException(
- "NPANDAY-109-004: Somehow the assembly reader provided multiple assembly descriptors, which is not supported by this mojo." );
- }
-
- Assembly singleAssembly = assemblies.get( 0 );
- createDirectory( singleAssembly, configurationSource );
- }
-
- private void createDirectory( final Assembly assembly, AssemblerConfigurationSource configurationSource )
- throws MojoExecutionException, MojoFailureException
- {
- final AssemblyArchiver archiver = assemblyArchiver;
-
- String fullName = configurationSource.getFinalName();
-
- try
- {
- archiver.createArchive( assembly, fullName, "dir", configurationSource );
- getLog().info(
- "NPANDAY-109-009: Prepared package " + fullName + " using assembly " + assembly.getId() + " in '"
- + configurationSource.getOutputDirectory() + "'." );
- }
- catch ( final ArchiveCreationException e )
- {
- throw new MojoExecutionException( "NPANDAY-109-005: Error creating aspnet package: " + e.getMessage(), e );
- }
- catch ( final AssemblyFormattingException e )
- {
- throw new MojoExecutionException( "NPANDAY-109-006: Error creating aspnet package: " + e.getMessage(), e );
- }
- catch ( final InvalidAssemblerConfigurationException e )
- {
- throw new MojoFailureException( assembly,
- "NPANDAY-109-007: Assembly for aspnet package is incorrectly configured: "
- + assembly.getId(),
- "Assembly: " + assembly.getId() + " is not configured correctly: "
- + e.getMessage() );
- }
- }
+package npanday.plugin.aspnet;
+
+/*
+ * 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 com.google.common.base.Objects;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
+import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
+import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
+import org.apache.maven.plugin.assembly.archive.AssemblyArchiver;
+import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
+import org.apache.maven.plugin.assembly.io.AssemblyReadException;
+import org.apache.maven.plugin.assembly.io.AssemblyReader;
+import org.apache.maven.plugin.assembly.model.Assembly;
+import org.apache.maven.shared.filtering.MavenFileFilter;
+
+import java.util.List;
+
+import static com.google.common.base.Strings.*;
+import static com.google.common.collect.Iterables.toArray;
+
+/**
+ * Maven Mojo preparing the packaging of ASP.NET web applications.
+ *
+ * @author <a href="mailto:lcorneliussen@apache.org">Lars Corneliussen</a>
+ * @goal assemble-package-files
+ * @description Maven Mojo for preparing the packaging of ASP.NET web applications
+ * @since 1.5.0-incubating
+ */
+public class AssemblePackageFilesMojo
+ extends AbstractMojo
+{
+ Splitter COMMANDLINE_LISTS_SPLITTER = Splitter.on( "," ).omitEmptyStrings().trimResults();
+
+ /**
+ * @parameter expression="${assemblyDescriptor}"
+ * @description Assembly XML Descriptor file. This must be the path to your customized descriptor file.
+ * <br><b>assemblyDescriptor will take precedence over {@see assemblyDescriptorRef}</b>
+ */
+ private String assemblyDescriptor;
+
+ /**
+ * @parameter expression="${mixinAssemblyComponentDescriptorList}"
+ * @description Commandline version of {@see mixinAssemblyComponentDescriptors}. Spearate each item with a comma.
+ */
+ private String mixinAssemblyComponentDescriptorList;
+
+ /**
+ * @parameter
+ * @description Component descriptors to be mixed into the main assembly descriptor from
+ * {@see assemblyDescriptorRef} or {@see assemblyDescriptor}.
+ * <br/>This is particularly useful, when the assembly descriptor is provided via the classpath.
+ */
+ private String[] mixinAssemblyComponentDescriptors;
+
+ /**
+ * @parameter expression="${assemblyDescriptorRef}" default-value="aspnet-webapp-defaults"
+ * @description A references to an assembly descriptor available on the plugin's classpath. The default
+ * classpath includes these built-in descriptors. You can add others by adding dependencies to the plugin.
+ * <br><b>assemblyDescriptorRef will be ignored, if {@see assemblyDescriptor} is configured</b>
+ */
+ private String assemblyDescriptorRef;
+
+ /**
+ * The Maven Session Object providing both the
+ * current project and the local repository.
+ *
+ * @parameter default-value="${session}"
+ * @required
+ * @readonly
+ */
+ private MavenSession mavenSession;
+
+ /**
+ * @component
+ */
+ private MixinAsssemblyReader assemblyReader;
+
+ /**
+ * @component
+ */
+ private AssemblyArchiver assemblyArchiver;
+
+ /**
+ * @component
+ */
+ private MavenFileFilter fileFilter;
+
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ long startTime = System.currentTimeMillis();
+
+ setupParameters();
+
+ final PackagePreparationConfigurationSource packageConfig =
+ new PackagePreparationConfigurationSource( mavenSession, fileFilter );
+
+ if ( !isNullOrEmpty( assemblyDescriptor ) )
+ {
+ packageConfig.setDescriptorFile( assemblyDescriptor );
+ }
+ else if ( !isNullOrEmpty( assemblyDescriptorRef ) )
+ {
+ packageConfig.setDescriptorRef( assemblyDescriptorRef );
+ }
+ else
+ {
+ throw new MojoFailureException( "NPANDAY-109-008: Please configure either assemblyDescriptorRef or assemblyDescriptor" );
+ }
+
+ assemblyReader.setComponentDescriptors( Objects.firstNonNull( mixinAssemblyComponentDescriptors, new String[0] ));
+
+ createPackage( packageConfig );
+
+ long endTime = System.currentTimeMillis();
+ getLog().debug( "Mojo Execution Time = " + ( endTime - startTime ) );
+ }
+
+ /**
+ * Copies from commandline parameters to "real" parameters.
+ */
+ private void setupParameters()
+ {
+ if ( !isNullOrEmpty( mixinAssemblyComponentDescriptorList ) )
+ {
+ mixinAssemblyComponentDescriptors =
+ toArray( COMMANDLINE_LISTS_SPLITTER.split( mixinAssemblyComponentDescriptorList ), String.class );
+ }
+ }
+
+ public void createPackage( AssemblerConfigurationSource configurationSource )
+ throws MojoExecutionException, MojoFailureException
+ {
+ List<Assembly> assemblies;
+ try
+ {
+ assemblies = assemblyReader.readAssemblies( configurationSource );
+ }
+ catch ( final AssemblyReadException e )
+ {
+ throw new MojoExecutionException( "NPANDAY-109-001: Error reading assembly descriptors: " + e.getMessage(),
+ e );
+ }
+ catch ( final InvalidAssemblerConfigurationException e )
+ {
+ throw new MojoFailureException( assemblyReader, e.getMessage(),
+ "NPANDAY-109-002: Mojo configuration is invalid: " + e.getMessage() );
+ }
+
+ if ( assemblies.size() == 0 )
+ {
+ throw new MojoExecutionException(
+ "NPANDAY-109-003: Somehow the assembly reader couldn't find the configured assembly descriptor" );
+ }
+
+ if ( assemblies.size() > 1 )
+ {
+ throw new MojoExecutionException(
+ "NPANDAY-109-004: Somehow the assembly reader provided multiple assembly descriptors, which is not supported by this mojo." );
+ }
+
+ Assembly singleAssembly = assemblies.get( 0 );
+ createDirectory( singleAssembly, configurationSource );
+ }
+
+ private void createDirectory( final Assembly assembly, AssemblerConfigurationSource configurationSource )
+ throws MojoExecutionException, MojoFailureException
+ {
+ final AssemblyArchiver archiver = assemblyArchiver;
+
+ String fullName = configurationSource.getFinalName();
+
+ try
+ {
+ archiver.createArchive( assembly, fullName, "dir", configurationSource );
+ getLog().info(
+ "NPANDAY-109-009: Prepared package " + fullName + " using assembly " + assembly.getId() + " in '"
+ + configurationSource.getOutputDirectory() + "'." );
+ }
+ catch ( final ArchiveCreationException e )
+ {
+ throw new MojoExecutionException( "NPANDAY-109-005: Error creating aspnet package: " + e.getMessage(), e );
+ }
+ catch ( final AssemblyFormattingException e )
+ {
+ throw new MojoExecutionException( "NPANDAY-109-006: Error creating aspnet package: " + e.getMessage(), e );
+ }
+ catch ( final InvalidAssemblerConfigurationException e )
+ {
+ throw new MojoFailureException( assembly,
+ "NPANDAY-109-007: Assembly for aspnet package is incorrectly configured: "
+ + assembly.getId(),
+ "Assembly: " + assembly.getId() + " is not configured correctly: "
+ + e.getMessage() );
+ }
+ }
}
\ No newline at end of file
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/aspnet/AssemblePackageFilesMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/aspnet/MixinAsssemblyReader.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/aspnet/MixinAsssemblyReader.java?rev=1222072&r1=1222071&r2=1222072&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/aspnet/MixinAsssemblyReader.java (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/aspnet/MixinAsssemblyReader.java Thu Dec 22 06:54:49 2011
@@ -1,56 +1,56 @@
-package npanday.plugin.aspnet;
-
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator;
-import org.apache.maven.plugin.assembly.io.AssemblyReadException;
-import org.apache.maven.plugin.assembly.io.DefaultAssemblyReader;
-import org.apache.maven.plugin.assembly.model.Assembly;
-
-import java.io.File;
-import java.io.Reader;
-
-/**
- * @author <a href="mailto:lcorneliussen@apache.org">Lars Corneliussen</a>
- */
-public class MixinAsssemblyReader extends DefaultAssemblyReader
-{
- private String[] componentDescriptors;
-
- /**
- * Add the contents of all included components to main assembly
- *
- * @throws org.apache.maven.plugin.assembly.io.AssemblyReadException
- *
- * @throws org.apache.maven.plugin.MojoFailureException
- *
- * @throws org.apache.maven.plugin.MojoExecutionException
- *
- */
- @Override
- protected void mergeComponentsWithMainAssembly( Assembly assembly, File assemblyDir,
- AssemblerConfigurationSource configSource )
- throws AssemblyReadException
- {
- appendComponentDescriptors( assembly );
-
- super.mergeComponentsWithMainAssembly( assembly, assemblyDir,
- configSource ); //To change body of overridden methods use File | Settings | File Templates.
- }
-
- /**
- * Add component descriptors from other sources.
- */
- protected void appendComponentDescriptors( Assembly assembly )
- {
- for (String componentDescriptor : componentDescriptors){
- getLogger().debug( "NPANDAY-110-001: Mixing in component descriptor '" + componentDescriptor + "' to assembly with id '" + assembly.getId() + "'.");
- assembly.addComponentDescriptor( componentDescriptor );
- }
- }
-
- public void setComponentDescriptors( String[] componentDescriptors )
- {
- this.componentDescriptors = componentDescriptors;
- }
-}
+package npanday.plugin.aspnet;
+
+import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
+import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
+import org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator;
+import org.apache.maven.plugin.assembly.io.AssemblyReadException;
+import org.apache.maven.plugin.assembly.io.DefaultAssemblyReader;
+import org.apache.maven.plugin.assembly.model.Assembly;
+
+import java.io.File;
+import java.io.Reader;
+
+/**
+ * @author <a href="mailto:lcorneliussen@apache.org">Lars Corneliussen</a>
+ */
+public class MixinAsssemblyReader extends DefaultAssemblyReader
+{
+ private String[] componentDescriptors;
+
+ /**
+ * Add the contents of all included components to main assembly
+ *
+ * @throws org.apache.maven.plugin.assembly.io.AssemblyReadException
+ *
+ * @throws org.apache.maven.plugin.MojoFailureException
+ *
+ * @throws org.apache.maven.plugin.MojoExecutionException
+ *
+ */
+ @Override
+ protected void mergeComponentsWithMainAssembly( Assembly assembly, File assemblyDir,
+ AssemblerConfigurationSource configSource )
+ throws AssemblyReadException
+ {
+ appendComponentDescriptors( assembly );
+
+ super.mergeComponentsWithMainAssembly( assembly, assemblyDir,
+ configSource ); //To change body of overridden methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Add component descriptors from other sources.
+ */
+ protected void appendComponentDescriptors( Assembly assembly )
+ {
+ for (String componentDescriptor : componentDescriptors){
+ getLogger().debug( "NPANDAY-110-001: Mixing in component descriptor '" + componentDescriptor + "' to assembly with id '" + assembly.getId() + "'.");
+ assembly.addComponentDescriptor( componentDescriptor );
+ }
+ }
+
+ public void setComponentDescriptors( String[] componentDescriptors )
+ {
+ this.componentDescriptors = componentDescriptors;
+ }
+}
Propchange: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/java/npanday/plugin/aspnet/MixinAsssemblyReader.java
------------------------------------------------------------------------------
svn:eol-style = native