You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/11/10 07:46:43 UTC
svn commit: r473208 [1/2] - in
/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio:
./ xml/
Author: brett
Date: Thu Nov 9 22:46:42 2006
New Revision: 473208
URL: http://svn.apache.org/viewvc?view=rev&rev=473208
Log:
reformat
Modified:
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/BuildAction.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/DependentUpon.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/ProjectSettings.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/Reference.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/References.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/SubType.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioFile.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioMojo.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioUtil.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003CSharpWriter.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003ConfigWriter.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003FileWriter.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003ReferenceWriter.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003SettingsWriter.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003WebInfoWriter.java
maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003Writer.java
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/BuildAction.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/BuildAction.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/BuildAction.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/BuildAction.java Thu Nov 9 22:46:42 2006
@@ -1,32 +1,44 @@
package org.apache.maven.plugin.vstudio;
-public class BuildAction {
-
- private String type = null;
-
- private BuildAction(String type){
- this.type = type;
- }
-
- private static String __BuildActionNone = "None";
- private static String __BuildActionCompile = "Compile";
- private static String __BuildActionContent = "Content";
- private static String __BuildActionEmbeddedResources = "EmbeddedResource";
-
- public static BuildAction None = new BuildAction( __BuildActionNone );
- public static BuildAction Compile = new BuildAction( __BuildActionCompile );
- public static BuildAction Content = new BuildAction( __BuildActionContent );
- public static BuildAction EmbeddedResources = new BuildAction( __BuildActionEmbeddedResources );
-
- public String toString() {
- return type;
- }
-
- public boolean equals(Object arg0) {
- if(arg0 instanceof BuildAction && ((BuildAction)arg0).type.equals( this.type ) )return true;
- return false;
- }
-
-
-
+public class BuildAction
+{
+
+ private String type = null;
+
+ private BuildAction( String type )
+ {
+ this.type = type;
+ }
+
+ private static String __BuildActionNone = "None";
+
+ private static String __BuildActionCompile = "Compile";
+
+ private static String __BuildActionContent = "Content";
+
+ private static String __BuildActionEmbeddedResources = "EmbeddedResource";
+
+ public static BuildAction None = new BuildAction( __BuildActionNone );
+
+ public static BuildAction Compile = new BuildAction( __BuildActionCompile );
+
+ public static BuildAction Content = new BuildAction( __BuildActionContent );
+
+ public static BuildAction EmbeddedResources = new BuildAction( __BuildActionEmbeddedResources );
+
+ public String toString()
+ {
+ return type;
+ }
+
+ public boolean equals( Object arg0 )
+ {
+ if ( arg0 instanceof BuildAction && ( (BuildAction) arg0 ).type.equals( this.type ) )
+ {
+ return true;
+ }
+ return false;
+ }
+
+
}
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/DependentUpon.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/DependentUpon.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/DependentUpon.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/DependentUpon.java Thu Nov 9 22:46:42 2006
@@ -1,18 +1,22 @@
package org.apache.maven.plugin.vstudio;
-public class DependentUpon {
+public class DependentUpon
+{
- private String fileName = null;
-
- public DependentUpon( String fileName ){
- this.fileName = fileName;
- }
+ private String fileName = null;
- public String getFileName() {
- return fileName;
- }
+ public DependentUpon( String fileName )
+ {
+ this.fileName = fileName;
+ }
- public String toString() {
- return fileName;
- }
+ public String getFileName()
+ {
+ return fileName;
+ }
+
+ public String toString()
+ {
+ return fileName;
+ }
}
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/ProjectSettings.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/ProjectSettings.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/ProjectSettings.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/ProjectSettings.java Thu Nov 9 22:46:42 2006
@@ -1,159 +1,258 @@
package org.apache.maven.plugin.vstudio;
-public class ProjectSettings {
+public class ProjectSettings
+{
- /* Settings inside the build element */
- private String rootNamespace = "";
- private String applicationIcon = "";
- private String assemblyKeyContainerName = "";
- private String assemblyName = "";
- private String assemblyOriginatorKeyFile = "";
- private String defaultClientScript = "JScript";
- private String defaultHTMLPageLayout = "Grid";
- private String defaultTargetSchema = "IE50";
- private String delaySign = "false";
- private String outputType = "Library";
- private String preBuildEvent = "";
- private String postBuildEvent = "";
- private String runPostBuildEvent = "OnBuildSuccess";
- private String startupObject= "";
- private String projectName = "";
-
- private String projectType = "Local";
- private String productVersion = "7.10.3077";
- private String schemaVersion = "2.0";
- private String projectGuid = "{E6E60F5C-A28D-4B3F-A01C-A334F848B9BE}";
-
- /**
+ /* Settings inside the build element */
+ private String rootNamespace = "";
+
+ private String applicationIcon = "";
+
+ private String assemblyKeyContainerName = "";
+
+ private String assemblyName = "";
+
+ private String assemblyOriginatorKeyFile = "";
+
+ private String defaultClientScript = "JScript";
+
+ private String defaultHTMLPageLayout = "Grid";
+
+ private String defaultTargetSchema = "IE50";
+
+ private String delaySign = "false";
+
+ private String outputType = "Library";
+
+ private String preBuildEvent = "";
+
+ private String postBuildEvent = "";
+
+ private String runPostBuildEvent = "OnBuildSuccess";
+
+ private String startupObject = "";
+
+ private String projectName = "";
+
+ private String projectType = "Local";
+
+ private String productVersion = "7.10.3077";
+
+ private String schemaVersion = "2.0";
+
+ private String projectGuid = "{E6E60F5C-A28D-4B3F-A01C-A334F848B9BE}";
+
+ /**
* if this project has a packaging type dotnet-web
- * then this parameter must be supplied so that the system can write out the
+ * then this parameter must be supplied so that the system can write out the
* .csproj.webinfo file as well as the .csproj file.
*/
private String webProjectUrlPath = null;
-
-
- public ProjectSettings(){}
-
-
- public String getProductVersion() {
- return productVersion;
- }
- public void setProductVersion(String productVersion) {
- this.productVersion = productVersion;
- }
- public String getProjectGuid() {
- return projectGuid;
- }
- public void setProjectGuid(String projectGuid) {
- this.projectGuid = projectGuid;
- }
- public String getProjectType() {
- return projectType;
- }
- public void setProjectType(String projectType) {
- this.projectType = projectType;
- }
- public String getSchemaVersion() {
- return schemaVersion;
- }
- public void setSchemaVersion(String schemaVersion) {
- this.schemaVersion = schemaVersion;
- }
- public String getProjectName() {
- return projectName;
- }
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
- public String getApplicationIcon() {
- return applicationIcon;
- }
- public void setApplicationIcon(String applicationIcon) {
- this.applicationIcon = applicationIcon;
- }
- public String getAssemblyKeyContainerName() {
- return assemblyKeyContainerName;
- }
- public void setAssemblyKeyContainerName(String assemblyKeyContainerName) {
- this.assemblyKeyContainerName = assemblyKeyContainerName;
- }
- public String getAssemblyName() {
- return assemblyName;
- }
- public void setAssemblyName(String assemblyName) {
- this.assemblyName = assemblyName;
- }
- public String getAssemblyOriginatorKeyFile() {
- return assemblyOriginatorKeyFile;
- }
- public void setAssemblyOriginatorKeyFile(String assemblyOriginatorKeyFile) {
- this.assemblyOriginatorKeyFile = assemblyOriginatorKeyFile;
- }
- public String getDefaultClientScript() {
- return defaultClientScript;
- }
- public void setDefaultClientScript(String defaultClientScript) {
- this.defaultClientScript = defaultClientScript;
- }
- public String getDefaultHTMLPageLayout() {
- return defaultHTMLPageLayout;
- }
- public void setDefaultHTMLPageLayout(String defaultHTMLPageLayout) {
- this.defaultHTMLPageLayout = defaultHTMLPageLayout;
- }
- public String getDefaultTargetSchema() {
- return defaultTargetSchema;
- }
- public void setDefaultTargetSchema(String defaultTargetSchema) {
- this.defaultTargetSchema = defaultTargetSchema;
- }
- public String getDelaySign() {
- return delaySign;
- }
- public void setDelaySign(String delaySign) {
- this.delaySign = delaySign;
- }
- public String getOutputType() {
- return outputType;
- }
- public void setOutputType(String outputType) {
- this.outputType = outputType;
- }
- public String getPostBuildEvent() {
- return postBuildEvent;
- }
- public void setPostBuildEvent(String postBuildEvent) {
- this.postBuildEvent = postBuildEvent;
- }
- public String getPreBuildEvent() {
- return preBuildEvent;
- }
- public void setPreBuildEvent(String preBuildEvent) {
- this.preBuildEvent = preBuildEvent;
- }
- public String getRootNamespace() {
- return rootNamespace;
- }
- public void setRootNamespace(String rootNamespace) {
- this.rootNamespace = rootNamespace;
- }
- public String getRunPostBuildEvent() {
- return runPostBuildEvent;
- }
- public void setRunPostBuildEvent(String runPostBuildEvent) {
- this.runPostBuildEvent = runPostBuildEvent;
- }
- public String getStartupObject() {
- return startupObject;
- }
- public void setStartupObject(String startupObject) {
- this.startupObject = startupObject;
- }
- public String getWebProjectUrlPath() {
- return webProjectUrlPath;
- }
- public void setWebProjectUrlPath(String webProjectUrlPath) {
- this.webProjectUrlPath = webProjectUrlPath;
- }
+
+
+ public ProjectSettings()
+ {
+ }
+
+
+ public String getProductVersion()
+ {
+ return productVersion;
+ }
+
+ public void setProductVersion( String productVersion )
+ {
+ this.productVersion = productVersion;
+ }
+
+ public String getProjectGuid()
+ {
+ return projectGuid;
+ }
+
+ public void setProjectGuid( String projectGuid )
+ {
+ this.projectGuid = projectGuid;
+ }
+
+ public String getProjectType()
+ {
+ return projectType;
+ }
+
+ public void setProjectType( String projectType )
+ {
+ this.projectType = projectType;
+ }
+
+ public String getSchemaVersion()
+ {
+ return schemaVersion;
+ }
+
+ public void setSchemaVersion( String schemaVersion )
+ {
+ this.schemaVersion = schemaVersion;
+ }
+
+ public String getProjectName()
+ {
+ return projectName;
+ }
+
+ public void setProjectName( String projectName )
+ {
+ this.projectName = projectName;
+ }
+
+ public String getApplicationIcon()
+ {
+ return applicationIcon;
+ }
+
+ public void setApplicationIcon( String applicationIcon )
+ {
+ this.applicationIcon = applicationIcon;
+ }
+
+ public String getAssemblyKeyContainerName()
+ {
+ return assemblyKeyContainerName;
+ }
+
+ public void setAssemblyKeyContainerName( String assemblyKeyContainerName )
+ {
+ this.assemblyKeyContainerName = assemblyKeyContainerName;
+ }
+
+ public String getAssemblyName()
+ {
+ return assemblyName;
+ }
+
+ public void setAssemblyName( String assemblyName )
+ {
+ this.assemblyName = assemblyName;
+ }
+
+ public String getAssemblyOriginatorKeyFile()
+ {
+ return assemblyOriginatorKeyFile;
+ }
+
+ public void setAssemblyOriginatorKeyFile( String assemblyOriginatorKeyFile )
+ {
+ this.assemblyOriginatorKeyFile = assemblyOriginatorKeyFile;
+ }
+
+ public String getDefaultClientScript()
+ {
+ return defaultClientScript;
+ }
+
+ public void setDefaultClientScript( String defaultClientScript )
+ {
+ this.defaultClientScript = defaultClientScript;
+ }
+
+ public String getDefaultHTMLPageLayout()
+ {
+ return defaultHTMLPageLayout;
+ }
+
+ public void setDefaultHTMLPageLayout( String defaultHTMLPageLayout )
+ {
+ this.defaultHTMLPageLayout = defaultHTMLPageLayout;
+ }
+
+ public String getDefaultTargetSchema()
+ {
+ return defaultTargetSchema;
+ }
+
+ public void setDefaultTargetSchema( String defaultTargetSchema )
+ {
+ this.defaultTargetSchema = defaultTargetSchema;
+ }
+
+ public String getDelaySign()
+ {
+ return delaySign;
+ }
+
+ public void setDelaySign( String delaySign )
+ {
+ this.delaySign = delaySign;
+ }
+
+ public String getOutputType()
+ {
+ return outputType;
+ }
+
+ public void setOutputType( String outputType )
+ {
+ this.outputType = outputType;
+ }
+
+ public String getPostBuildEvent()
+ {
+ return postBuildEvent;
+ }
+
+ public void setPostBuildEvent( String postBuildEvent )
+ {
+ this.postBuildEvent = postBuildEvent;
+ }
+
+ public String getPreBuildEvent()
+ {
+ return preBuildEvent;
+ }
+
+ public void setPreBuildEvent( String preBuildEvent )
+ {
+ this.preBuildEvent = preBuildEvent;
+ }
+
+ public String getRootNamespace()
+ {
+ return rootNamespace;
+ }
+
+ public void setRootNamespace( String rootNamespace )
+ {
+ this.rootNamespace = rootNamespace;
+ }
+
+ public String getRunPostBuildEvent()
+ {
+ return runPostBuildEvent;
+ }
+
+ public void setRunPostBuildEvent( String runPostBuildEvent )
+ {
+ this.runPostBuildEvent = runPostBuildEvent;
+ }
+
+ public String getStartupObject()
+ {
+ return startupObject;
+ }
+
+ public void setStartupObject( String startupObject )
+ {
+ this.startupObject = startupObject;
+ }
+
+ public String getWebProjectUrlPath()
+ {
+ return webProjectUrlPath;
+ }
+
+ public void setWebProjectUrlPath( String webProjectUrlPath )
+ {
+ this.webProjectUrlPath = webProjectUrlPath;
+ }
}
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/Reference.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/Reference.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/Reference.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/Reference.java Thu Nov 9 22:46:42 2006
@@ -1,39 +1,43 @@
package org.apache.maven.plugin.vstudio;
-import java.io.File;
+public class Reference
+{
-public class Reference {
+ private String path = null;
+
+ private boolean gac = false;
+
+ /**
+ * @return Returns the gac.
+ */
+ public boolean getGac()
+ {
+ return gac;
+ }
+
+ /**
+ * @param gac The gac to set.
+ */
+ public void setGac( boolean gac )
+ {
+ this.gac = gac;
+ }
+
+ /**
+ * @return Returns the path.
+ */
+ public String getPath()
+ {
+ return path;
+ }
+
+ /**
+ * @param path The path to set.
+ */
+ public void setPath( String path )
+ {
+ this.path = path;
+ }
- private String path = null;
- private boolean gac = false;
-
- /**
- * @return Returns the gac.
- */
- public boolean getGac() {
- return gac;
- }
- /**
- * @param gac The gac to set.
- */
- public void setGac(boolean gac) {
- this.gac = gac;
- }
- /**
- * @return Returns the path.
- */
- public String getPath() {
- return path;
- }
- /**
- * @param path The path to set.
- */
- public void setPath(String path) {
- this.path = path;
- }
-
-
-
-
}
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/References.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/References.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/References.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/References.java Thu Nov 9 22:46:42 2006
@@ -3,26 +3,30 @@
import java.util.ArrayList;
import java.util.List;
-public class References {
+public class References
+{
- private List references = new ArrayList();
+ private List references = new ArrayList();
- /**
- * @return Returns the references.
- */
- public List getReferences() {
- return references;
- }
+ /**
+ * @return Returns the references.
+ */
+ public List getReferences()
+ {
+ return references;
+ }
- /**
- * @param references The references to set.
- */
- public void setReferences(List references) {
- this.references = references;
- }
-
- public void addReference(Reference ref){
- this.references.add( ref );
- }
+ /**
+ * @param references The references to set.
+ */
+ public void setReferences( List references )
+ {
+ this.references = references;
+ }
+
+ public void addReference( Reference ref )
+ {
+ this.references.add( ref );
+ }
}
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/SubType.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/SubType.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/SubType.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/SubType.java Thu Nov 9 22:46:42 2006
@@ -1,32 +1,50 @@
package org.apache.maven.plugin.vstudio;
-public class SubType {
+public class SubType
+{
- private static String __SubTypeCode = "Code";
- private static String __SubTypeNull = "";
- private static String __SubTypeForm = "Form";
- private static String __SubTypeComponent = "Component";
- private static String __SubTypeAspxCodeBehind = "ASPXCodeBehind";
-
- private String _type = null;
-
- private SubType(String subtype){
- _type = subtype;
- }
-
- public static final SubType Code = new SubType( __SubTypeCode );
- public static final SubType Null = new SubType( __SubTypeNull );
- public static final SubType Form = new SubType( __SubTypeForm );
- public static final SubType AspxCodeBehind = new SubType( __SubTypeAspxCodeBehind );
- public static final SubType Component = new SubType( __SubTypeComponent );
-
- public String toString() {
- return _type;
- }
-
- public boolean equals(Object arg0) {
- if(arg0 instanceof SubType && ((SubType)arg0)._type.equals( this._type ) )return true;
- else if (arg0 instanceof SubType && ((SubType)arg0)._type.equals( "" ) && this._type.equals("") ) return true;
- return false;
- }
+ private static String __SubTypeCode = "Code";
+
+ private static String __SubTypeNull = "";
+
+ private static String __SubTypeForm = "Form";
+
+ private static String __SubTypeComponent = "Component";
+
+ private static String __SubTypeAspxCodeBehind = "ASPXCodeBehind";
+
+ private String _type = null;
+
+ private SubType( String subtype )
+ {
+ _type = subtype;
+ }
+
+ public static final SubType Code = new SubType( __SubTypeCode );
+
+ public static final SubType Null = new SubType( __SubTypeNull );
+
+ public static final SubType Form = new SubType( __SubTypeForm );
+
+ public static final SubType AspxCodeBehind = new SubType( __SubTypeAspxCodeBehind );
+
+ public static final SubType Component = new SubType( __SubTypeComponent );
+
+ public String toString()
+ {
+ return _type;
+ }
+
+ public boolean equals( Object arg0 )
+ {
+ if ( arg0 instanceof SubType && ( (SubType) arg0 )._type.equals( this._type ) )
+ {
+ return true;
+ }
+ else if ( arg0 instanceof SubType && ( (SubType) arg0 )._type.equals( "" ) && this._type.equals( "" ) )
+ {
+ return true;
+ }
+ return false;
+ }
}
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioFile.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioFile.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioFile.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioFile.java Thu Nov 9 22:46:42 2006
@@ -2,58 +2,73 @@
import java.io.File;
-public class VisualStudioFile {
+public class VisualStudioFile
+{
- private File file = null;
- private BuildAction action = null;
- private String relativePath = null;
- private SubType sub = null;
- private DependentUpon dependent = null;
-
- public VisualStudioFile(File file, BuildAction action, String relativePath, SubType sub){
- this.file = file;
- this.action = action;
- this.relativePath = relativePath;
- this.sub = sub;
- }
-
- public VisualStudioFile(File file, BuildAction action, String relativePath, SubType sub, DependentUpon dependent){
- this.file = file;
- this.action = action;
- this.relativePath = relativePath;
- this.sub = sub;
- this.dependent = dependent;
- }
-
- public VisualStudioFile(File file, BuildAction action, String relativePath, DependentUpon dependent){
- this.file = file;
- this.action = action;
- this.relativePath = relativePath;
- this.dependent = dependent;
- }
-
- public BuildAction getAction() {
- return action;
- }
-
- public File getFile() {
- return file;
- }
-
- public String getRelativePath() {
- return relativePath;
- }
-
- public SubType getSub() {
- return sub;
- }
-
- public DependentUpon getDependent() {
- return dependent;
- }
-
-
- public String toString() {
- return "VSFile[@rel="+relativePath+",@path="+file.getAbsolutePath()+",@action="+action+",@subtype="+sub+",@dep="+dependent+"]";
- }
+ private File file = null;
+
+ private BuildAction action = null;
+
+ private String relativePath = null;
+
+ private SubType sub = null;
+
+ private DependentUpon dependent = null;
+
+ public VisualStudioFile( File file, BuildAction action, String relativePath, SubType sub )
+ {
+ this.file = file;
+ this.action = action;
+ this.relativePath = relativePath;
+ this.sub = sub;
+ }
+
+ public VisualStudioFile( File file, BuildAction action, String relativePath, SubType sub, DependentUpon dependent )
+ {
+ this.file = file;
+ this.action = action;
+ this.relativePath = relativePath;
+ this.sub = sub;
+ this.dependent = dependent;
+ }
+
+ public VisualStudioFile( File file, BuildAction action, String relativePath, DependentUpon dependent )
+ {
+ this.file = file;
+ this.action = action;
+ this.relativePath = relativePath;
+ this.dependent = dependent;
+ }
+
+ public BuildAction getAction()
+ {
+ return action;
+ }
+
+ public File getFile()
+ {
+ return file;
+ }
+
+ public String getRelativePath()
+ {
+ return relativePath;
+ }
+
+ public SubType getSub()
+ {
+ return sub;
+ }
+
+ public DependentUpon getDependent()
+ {
+ return dependent;
+ }
+
+
+ public String toString()
+ {
+ return "VSFile[@rel=" + relativePath + ",@path=" + file.getAbsolutePath() + ",@action=" + action +
+ ",@subtype=" + sub + ",@dep=" + dependent + "]";
+ }
}
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioMojo.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioMojo.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioMojo.java Thu Nov 9 22:46:42 2006
@@ -20,14 +20,12 @@
import org.apache.commons.io.FilenameUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.vstudio.xml.VisualStudio2003WebInfoWriter;
import org.apache.maven.plugin.vstudio.xml.VisualStudio2003Writer;
import org.apache.maven.project.MavenProject;
-
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
import org.codehaus.plexus.util.xml.XMLWriter;
@@ -43,16 +41,17 @@
/**
* Generates a Visual Studio Project
- * file from the pom.xml
+ * file from the pom.xml
*
* @requiresDependencyResolution test
* @goal vstudio
- *
*/
-public class VisualStudioMojo extends AbstractMojo
+public class VisualStudioMojo
+ extends AbstractMojo
{
/**
* Location of the file.
+ *
* @parameter expression="${project.build.directory}"
* @required
*/
@@ -73,7 +72,7 @@
* @readonly
*/
private List compileSourceRoots;
-
+
/**
* The list of resources we want to transfer.
*
@@ -81,30 +80,29 @@
* @required
*/
private List resources;
-
+
/**
* This value is the path to the framework firectory
* on your local machine. Please see the <a href="/getting-started.html">Getting Started</a>.
- * guide on how to do this.
- *
- *
+ * guide on how to do this.
+ *
* @parameter
- * @required
+ * @required
*/
- private String frameworkHome;
-
+ private String frameworkHome;
+
/**
- * This is all the stuff that can be set up about a vs project. It is a big object.
+ * This is all the stuff that can be set up about a vs project. It is a big object.
* Most of which is optional. See the java doc and your own project for details.
- *
- * @parameter
+ *
+ * @parameter
*/
private ProjectSettings projectSettings;
-
+
/**
- * A list of inclusion filters for the .csproj.
+ * A list of inclusion filters for the .csproj.
* ex.
- *
+ * <p/>
* **\/*.cs
* **\/*.xslt
* (ignore back slash)
@@ -119,207 +117,276 @@
* @parameter
*/
private Set excludes = new HashSet();
-
+
/**
- * A list of System references with paths to resolve for IDE.
+ * A list of System references with paths to resolve for IDE.
* These are required for the IDE's intellisense but are added
- * to the classpath (;o) at
+ * to the classpath (;o) at
* a) compile through the addition of MS Core Lib
* or
* b) runtime through the bootstrapper function is MS dotnet or the mono
- * runtime exe for mono.
+ * runtime exe for mono.
*
* @parameter
*/
private List references = new ArrayList();
-
+
/**
* @parameter expression="${component.org.apache.maven.artifact.factory.ArtifactFactory}"
* @required
* @readonly
*/
protected ArtifactFactory factory;
-
- public void execute()throws MojoExecutionException
+
+ public void execute()
+ throws MojoExecutionException
+ {
+ this.getLog().info( "framework.home=" + frameworkHome );
+
+ //if its null use the defaults.
+ if ( projectSettings == null )
+ {
+ projectSettings = new ProjectSettings();
+ }
+
+ projectSettings.setRootNamespace( project.getGroupId() );
+ projectSettings.setAssemblyName( project.getBuild().getFinalName() );
+ projectSettings.setOutputType( getOutputTypeFromType( project.getArtifact().getType() ) );
+ projectSettings.setProjectType( getProjectTypeFromType( project.getArtifact().getType() ) );
+
+ if ( project.getArtifact().getType().equals( "dotnet-web" ) && (
+ projectSettings.getWebProjectUrlPath() == null ||
+ StringUtils.isEmpty( projectSettings.getWebProjectUrlPath() ) ) )
+ {
+ throw new MojoExecutionException(
+ "if you are creating a project of type dotnet-web you need to provide the parameter projectSettings/webProjectUrlPath" );
+ }
+
+ for ( Iterator i = project.getCompileSourceRoots().iterator(); i.hasNext(); )
+ {
+ this.getLog().info( "source root:" + i.next() );
+ }
+
+ for ( Iterator i = project.getTestCompileSourceRoots().iterator(); i.hasNext(); )
+ {
+ this.getLog().info( "source root:" + i.next() );
+ }
+
+ for ( Iterator i = project.getResources().iterator(); i.hasNext(); )
+ {
+ getLog().info( "res:" + i.next() );
+ }
+
+ VisualStudioFile[] mainsource = VisualStudioUtil.getSourceFiles( project.getBasedir(),
+ project.getCompileSourceRoots(), includes,
+ excludes );
+ VisualStudioFile[] testsource = VisualStudioUtil.getSourceFiles( project.getBasedir(),
+ project.getTestCompileSourceRoots(), includes,
+ excludes );
+ VisualStudioFile[] resources =
+ VisualStudioUtil.getResourceFiles( project.getBasedir(), project.getResources() );
+ VisualStudioFile pom = VisualStudioUtil.getPom( project );
+
+ File projectFile = new File( project.getBasedir(), project.getArtifactId() + ".csproj" );
+
+ try
+ {
+
+ this.getLog().info( "Creating project file [" + projectFile.getAbsolutePath() + "]" );
+
+ projectFile.createNewFile();
+
+ FileWriter filewriter = new FileWriter( projectFile );
+
+ XMLWriter writer = new PrettyPrintXMLWriter( filewriter );
+
+ File frameworkDir = new File( frameworkHome );
+
+ if ( !frameworkDir.exists() || !frameworkDir.isDirectory() )
+ {
+ throw new MojoExecutionException( "\nframeworkHome is null or incorrect" + frameworkHome +
+ "\nframeworkHome needs to be set in your settings.xml and passed to plugin via pom.xml\n" +
+ getUsage() );
+ }
+
+ this.getLog().info( "Creating dependencies from references... " );
+
+ Set referenceArtifacts = createReferenceArtifacts( references );
+
+ this.getLog().info( "Created " + referenceArtifacts.size() + " dependencies." );
+
+ new VisualStudio2003Writer( this.getLog() ).write( writer, projectSettings, mainsource, testsource,
+ resources, project.getArtifacts(), frameworkDir, pom,
+ referenceArtifacts );
+
+ this.getLog().info( "Created project file [" + projectFile.getAbsolutePath() + "]" );
+
+ filewriter.close();
+
+ if ( project.getArtifact().getType().equals( "dotnet-web" ) )
+ {
+ createWebInfoFile( new File( project.getBasedir(), project.getArtifactId() + ".csproj.webinfo" ),
+ projectSettings );
+ }
+
+ }
+ catch ( IOException ioex )
+ {
+ throw new MojoExecutionException( ioex.getMessage(), ioex );
+ }
+ }
+
+ private void createWebInfoFile( File webInfoFile, ProjectSettings settings )
+ throws IOException
{
- this.getLog().info("framework.home=" + frameworkHome);
-
- //if its null use the defaults.
- if(projectSettings == null) projectSettings = new ProjectSettings();
-
- projectSettings.setRootNamespace( project.getGroupId() );
- projectSettings.setAssemblyName( project.getBuild().getFinalName() );
- projectSettings.setOutputType( getOutputTypeFromType(project.getArtifact().getType() ) );
- projectSettings.setProjectType( getProjectTypeFromType( project.getArtifact().getType() ) );
-
- if( project.getArtifact().getType().equals( "dotnet-web" ) && ( projectSettings.getWebProjectUrlPath() == null || StringUtils.isEmpty( projectSettings.getWebProjectUrlPath() ) ) )
- throw new MojoExecutionException("if you are creating a project of type dotnet-web you need to provide the parameter projectSettings/webProjectUrlPath");
-
- for( Iterator i = project.getCompileSourceRoots().iterator(); i.hasNext(); ){
- this.getLog().info("source root:" + i.next() );
- }
-
- for( Iterator i = project.getTestCompileSourceRoots().iterator(); i.hasNext(); ){
- this.getLog().info("source root:" + i.next() );
- }
-
- for( Iterator i= project.getResources().iterator();i.hasNext();){
- getLog().info("res:" + i.next() );
- }
-
- VisualStudioFile[] mainsource = VisualStudioUtil.getSourceFiles( project.getBasedir(), project.getCompileSourceRoots(), includes, excludes );
- VisualStudioFile[] testsource = VisualStudioUtil.getSourceFiles( project.getBasedir(), project.getTestCompileSourceRoots(), includes, excludes );
- VisualStudioFile[] resources = VisualStudioUtil.getResourceFiles( project.getBasedir(), project.getResources() );
- VisualStudioFile pom = VisualStudioUtil.getPom( project );
-
- File projectFile = new File( project.getBasedir(), project.getArtifactId() + ".csproj");
-
- try {
-
- this.getLog().info("Creating project file ["+projectFile.getAbsolutePath()+"]");
-
- projectFile.createNewFile();
-
- FileWriter filewriter = new FileWriter( projectFile );
-
- XMLWriter writer = new PrettyPrintXMLWriter(filewriter);
-
- File frameworkDir = new File( frameworkHome );
-
- if(! frameworkDir.exists() || ! frameworkDir.isDirectory() )throw new MojoExecutionException(
- "\nframeworkHome is null or incorrect" + frameworkHome +
- "\nframeworkHome needs to be set in your settings.xml and passed to plugin via pom.xml\n" + getUsage() );
-
- this.getLog().info("Creating dependencies from references... ");
-
- Set referenceArtifacts = createReferenceArtifacts( references );
-
- this.getLog().info("Created " + referenceArtifacts.size() + " dependencies.");
-
- new VisualStudio2003Writer( this.getLog() ).write( writer, projectSettings, mainsource, testsource, resources, project.getArtifacts(), frameworkDir, pom, referenceArtifacts );
-
- this.getLog().info("Created project file ["+projectFile.getAbsolutePath()+"]");
-
- filewriter.close();
-
- if( project.getArtifact().getType().equals( "dotnet-web" ) )
- createWebInfoFile( new File( project.getBasedir(), project.getArtifactId() + ".csproj.webinfo" ), projectSettings );
-
- }catch(IOException ioex){
- throw new MojoExecutionException(ioex.getMessage(), ioex);
- }
+
+ if ( webInfoFile.exists() )
+ {
+ FileUtils.copyFile( webInfoFile, new File( webInfoFile.getAbsoluteFile() + ".backup" ) );
+ webInfoFile.delete();
+ }
+
+ webInfoFile.createNewFile();
+
+ FileWriter filewriter = new FileWriter( webInfoFile );
+
+ XMLWriter writer = new PrettyPrintXMLWriter( filewriter );
+
+ new VisualStudio2003WebInfoWriter( this.getLog() ).write( writer, settings.getWebProjectUrlPath() );
+
+ filewriter.close();
}
-
- private void createWebInfoFile(File webInfoFile, ProjectSettings settings) throws IOException {
-
- if( webInfoFile.exists() ) {
- FileUtils.copyFile( webInfoFile, new File( webInfoFile.getAbsoluteFile() + ".backup" ) );
- webInfoFile.delete();
- }
-
- webInfoFile.createNewFile();
-
- FileWriter filewriter = new FileWriter( webInfoFile );
-
- XMLWriter writer = new PrettyPrintXMLWriter(filewriter);
-
- new VisualStudio2003WebInfoWriter( this.getLog() ).write( writer, settings.getWebProjectUrlPath() );
-
- filewriter.close();
+
+
+ private static String getUsage()
+ {
+
+ String usage = "To configure this plugin you should add an entry to your local settings like so:\n" + "....\n" +
+ "<profiles>\n" + "<profile>\n" + "<id>default</id>\n" + "<properties>\n" +
+ "<dotnet.home>C:/WINDOWS/Microsoft.NET/Framework/v1.1.4322</dotnet.home>\n" + "</properties>\n" + "....\n" +
+ "</profile>\n" + "</profiles>\n" + "<activeProfiles>\n" + "<activeProfile>default</activeProfile>\n" +
+ "</activeProfiles>\n";
+
+ usage = usage + "\n";
+
+ usage = usage + "Add pass this into the plgin in this manner:\n";
+
+ usage = usage + "<plugin>\n" + "<groupId>org.apache.maven.plugins</groupId>\n" +
+ "<artifactId>maven-studio-plugin</artifactId>\n" + "<configuration>\n" +
+ "<frameworkHome>${dotnet.home}</frameworkHome>\n" + "</configuration>\n" + "</plugin>\n";
+
+ return usage;
}
-
-
- private static String getUsage(){
-
- String usage = "To configure this plugin you should add an entry to your local settings like so:\n" +
- "....\n" +
- "<profiles>\n" +
- "<profile>\n" +
- "<id>default</id>\n" +
- "<properties>\n" +
- "<dotnet.home>C:/WINDOWS/Microsoft.NET/Framework/v1.1.4322</dotnet.home>\n" +
- "</properties>\n"+
- "....\n" +
- "</profile>\n" +
- "</profiles>\n" +
- "<activeProfiles>\n" +
- "<activeProfile>default</activeProfile>\n" +
- "</activeProfiles>\n";
-
- usage = usage + "\n";
-
- usage = usage + "Add pass this into the plgin in this manner:\n";
-
- usage = usage + "<plugin>\n" +
- "<groupId>org.apache.maven.plugins</groupId>\n" +
- "<artifactId>maven-studio-plugin</artifactId>\n" +
- "<configuration>\n" +
- "<frameworkHome>${dotnet.home}</frameworkHome>\n" +
- "</configuration>\n" +
- "</plugin>\n";
-
- return usage;
+
+ private String getOutputTypeFromType( String type )
+ throws MojoExecutionException
+ {
+
+ String outputType = "Library";
+
+ if ( type.equals( "dotnet-library" ) )
+ {
+ outputType = "Library";
+ }
+ else if ( type.equals( "dotnet-exe" ) )
+ {
+ outputType = "Exe";
+ }
+ else if ( type.equals( "dotnet-winexe" ) )
+ {
+ outputType = "Exe";
+ }
+ else if ( type.equals( "dotnet-webapp" ) )
+ {
+ outputType = "Web";
+ }
+ else
+ {
+ throw new MojoExecutionException( "No Visual Studio output type defined for type:" + type );
+ }
+
+ return outputType;
}
-
- private String getOutputTypeFromType(String type) throws MojoExecutionException {
-
- String outputType = "Library";
-
- if( type.equals("dotnet-library") ) outputType = "Library";
- else if( type.equals("dotnet-exe") ) outputType = "Exe";
- else if( type.equals("dotnet-winexe") ) outputType = "Exe";
- else if( type.equals("dotnet-webapp") ) outputType = "Web";
- else throw new MojoExecutionException("No Visual Studio output type defined for type:" + type);
-
- return outputType;
+
+ private String getProjectTypeFromType( String type )
+ throws MojoExecutionException
+ {
+ String outputType = "Local";
+ if ( type.equals( "dotnet-webapp" ) )
+ {
+ outputType = "Web";
+ }
+ return outputType;
}
-
- private String getProjectTypeFromType(String type) throws MojoExecutionException {
- String outputType = "Local";
- if( type.equals("dotnet-webapp") ) outputType = "Web";
- return outputType;
+
+ private Set createReferenceArtifacts( List references )
+ throws MojoExecutionException
+ {
+
+ Set artifacts = new HashSet();
+
+ for ( Iterator i = references.iterator(); i.hasNext(); )
+ {
+ Reference ref = (Reference) i.next();
+ Artifact a = createArtifact( ref );
+ if ( a != null )
+ {
+ artifacts.add( a );
+ }
+ }
+
+ return artifacts;
}
-
- private Set createReferenceArtifacts(List references) throws MojoExecutionException {
-
- Set artifacts = new HashSet();
-
- for(Iterator i=references.iterator();i.hasNext();){
- Reference ref = (Reference)i.next();
- Artifact a = createArtifact( ref );
- if( a != null ) artifacts.add( a );
- }
-
- return artifacts;
+
+ private Artifact createArtifact( Reference ref )
+ throws MojoExecutionException
+ {
+
+ File f = new File( this.frameworkHome, ref.getPath() );
+
+ if ( ( !f.exists() ) || f.isDirectory() )
+ {
+ throw new MojoExecutionException( "File [" + f.getAbsolutePath() + "] doesn't appear to exist." );
+ }
+
+ String name = FilenameUtils.getBaseName( f.getName() );
+ String packaging = getPackagingForExtension( FilenameUtils.getExtension( f.getName() ) );
+
+ Artifact a = factory.createDependencyArtifact( "system", name, VersionRange.createFromVersion( "1.0" ),
+ packaging, null, Artifact.SCOPE_SYSTEM, null, false );
+
+ a.setFile( f );
+
+ return a;
}
- private Artifact createArtifact(Reference ref) throws MojoExecutionException{
-
- File f = new File( this.frameworkHome, ref.getPath() );
-
- if( (! f.exists() ) || f.isDirectory() ) throw new MojoExecutionException("File [" + f.getAbsolutePath() + "] doesn't appear to exist.");
-
- String name = FilenameUtils.getBaseName( f.getName() );
- String packaging = getPackagingForExtension( FilenameUtils.getExtension( f.getName() ) );
-
- Artifact a = factory.createDependencyArtifact( "system", name, VersionRange.createFromVersion("1.0"), packaging, null, Artifact.SCOPE_SYSTEM, null, false );
-
- a.setFile( f );
-
- return a;
+
+ private static String getPackagingForExtension( String extension )
+ {
+
+ String packaging = null;
+
+ if ( extension.toLowerCase().equals( "dll" ) )
+ {
+ packaging = "dotnet-library";
+ }
+ else if ( extension.toLowerCase().equals( "exe" ) )
+ {
+ packaging = "dotnet-exe";
+ }
+ else if ( extension.toLowerCase().equals( "exe" ) )
+ {
+ packaging = "dotnet-winexe";
+ }
+ else if ( extension.toLowerCase().equals( "dll" ) )
+ {
+ packaging = "dotnet-module";
+ }
+ else if ( extension.toLowerCase().equals( "dll" ) )
+ {
+ packaging = "dotnet-webapp";
+ }
+
+ return packaging;
}
-
-
- private static String getPackagingForExtension(String extension){
-
- String packaging = null;
-
- if( extension.toLowerCase().equals( "dll" ) ) packaging = "dotnet-library" ;
- else if( extension.toLowerCase().equals( "exe") ) packaging = "dotnet-exe" ;
- else if( extension.toLowerCase().equals( "exe" ) ) packaging = "dotnet-winexe" ;
- else if( extension.toLowerCase().equals( "dll") ) packaging = "dotnet-module" ;
- else if( extension.toLowerCase().equals( "dll") ) packaging = "dotnet-webapp" ;
-
- return packaging;
- }
}
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioUtil.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioUtil.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioUtil.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/VisualStudioUtil.java Thu Nov 9 22:46:42 2006
@@ -1,221 +1,287 @@
package org.apache.maven.plugin.vstudio;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.maven.model.Resource;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.StringUtils;
+
import java.io.File;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.StringUtils;
+public class VisualStudioUtil
+{
-public class VisualStudioUtil {
-
private static final String[] EMPTY_STRING_ARRAY = {};
private static final String[] DEFAULT_INCLUDES = {"**/**"};
+
private static final String[] DEFAULT_INCLUDES_CSHARP = {"**/*.cs"};
-
- public static VisualStudioFile getPom(MavenProject project) {
-
- String relativeToProjectRoot = toRelativeAndFixSeparator( project.getBasedir(), project.getFile().getAbsolutePath(), false );
-
- VisualStudioFile file = new VisualStudioFile( project.getFile(), BuildAction.Content, relativeToProjectRoot, SubType.Null );
-
- return file;
+
+ public static VisualStudioFile getPom( MavenProject project )
+ {
+
+ String relativeToProjectRoot =
+ toRelativeAndFixSeparator( project.getBasedir(), project.getFile().getAbsolutePath(), false );
+
+ VisualStudioFile file =
+ new VisualStudioFile( project.getFile(), BuildAction.Content, relativeToProjectRoot, SubType.Null );
+
+ return file;
}
-
-
+
+
public static String toRelativeAndFixSeparator( File basedir, String absolutePath, boolean replaceSlashes )
{
String relative = "";
System.out.println( "absolute path" + absolutePath );
-
+
if ( absolutePath.equals( basedir.getAbsolutePath() ) )
{
- System.out.println("option 1");
+ System.out.println( "option 1" );
//relative = ".";
}
else if ( absolutePath.startsWith( basedir.getAbsolutePath() ) )
{
- System.out.println("option 2");
+ System.out.println( "option 2" );
relative = absolutePath.substring( basedir.getAbsolutePath().length() + 1 );
}
else
{
- System.out.println("option 3");
+ System.out.println( "option 3" );
relative = absolutePath;
}
- if( relative.startsWith(".") )
- relative = relative.substring(2, relative.length() );
-
+ if ( relative.startsWith( "." ) )
+ {
+ relative = relative.substring( 2, relative.length() );
+ }
+
relative = StringUtils.replace( relative, "", "\\" ); //$NON-NLS-1$ //$NON-NLS-2$
return relative;
}
-
- public static VisualStudioFile[] getSourceFiles(File baseDir, List sourceFileRoots, Set includes, Set excludes) {
-
- ArrayList list = new ArrayList();
-
- for( Iterator i=sourceFileRoots.iterator();i.hasNext();){
-
- DirectoryScanner scanner = new DirectoryScanner();
-
- String root = (String) i.next();
-
- File rootDir = new File( root );
-
- if( ! rootDir.exists() || ! rootDir.isDirectory() ) break;
-
- scanner.setBasedir( root );
-
- //process the includes and excludes...
- if( includes == null || includes.isEmpty() )
- scanner.setIncludes( DEFAULT_INCLUDES_CSHARP );
- else
- scanner.setIncludes( getStringArrayFromSet( includes ) );
-
- if( excludes == null || excludes.isEmpty() )
- scanner.setExcludes( getStringArrayFromSet( excludes ) );
- else
- scanner.addDefaultExcludes();
-
- scanner.scan();
-
- List includedFiles = Arrays.asList( scanner.getIncludedFiles() );
-
- for ( Iterator j = includedFiles.iterator(); j.hasNext(); )
- {
- String relativePath = (String) j.next();
-
- File f = new File( rootDir, relativePath );
-
- String relativeToProjectRoot = toRelativeAndFixSeparator( baseDir, f.getAbsolutePath(), false );
-
- VisualStudioFile file = create( f, relativeToProjectRoot );
-
- if( file != null ) list.add( file );
- }
- }
-
- return (VisualStudioFile[] )list.toArray( new VisualStudioFile[ list.size() ] );
+
+ public static VisualStudioFile[] getSourceFiles( File baseDir, List sourceFileRoots, Set includes, Set excludes )
+ {
+
+ ArrayList list = new ArrayList();
+
+ for ( Iterator i = sourceFileRoots.iterator(); i.hasNext(); )
+ {
+
+ DirectoryScanner scanner = new DirectoryScanner();
+
+ String root = (String) i.next();
+
+ File rootDir = new File( root );
+
+ if ( !rootDir.exists() || !rootDir.isDirectory() )
+ {
+ break;
+ }
+
+ scanner.setBasedir( root );
+
+ //process the includes and excludes...
+ if ( includes == null || includes.isEmpty() )
+ {
+ scanner.setIncludes( DEFAULT_INCLUDES_CSHARP );
+ }
+ else
+ {
+ scanner.setIncludes( getStringArrayFromSet( includes ) );
+ }
+
+ if ( excludes == null || excludes.isEmpty() )
+ {
+ scanner.setExcludes( getStringArrayFromSet( excludes ) );
+ }
+ else
+ {
+ scanner.addDefaultExcludes();
+ }
+
+ scanner.scan();
+
+ List includedFiles = Arrays.asList( scanner.getIncludedFiles() );
+
+ for ( Iterator j = includedFiles.iterator(); j.hasNext(); )
+ {
+ String relativePath = (String) j.next();
+
+ File f = new File( rootDir, relativePath );
+
+ String relativeToProjectRoot = toRelativeAndFixSeparator( baseDir, f.getAbsolutePath(), false );
+
+ VisualStudioFile file = create( f, relativeToProjectRoot );
+
+ if ( file != null )
+ {
+ list.add( file );
+ }
+ }
+ }
+
+ return (VisualStudioFile[]) list.toArray( new VisualStudioFile[list.size()] );
}
-
+
/**
- * factory method
- *
+ * factory method
+ * <p/>
* This is a bit messy.....
- *
+ *
* @param f
* @param relativePath
* @return
*/
- private static VisualStudioFile create(File f, String relativePath){
-
- VisualStudioFile vsf = null;
-
- if( lastNCharsEqual( f.getName(), 10, ".aspx.resx" ) ) {
- //add .resx for aspx file
- vsf = new VisualStudioFile( f, BuildAction.EmbeddedResources, relativePath, new DependentUpon( FilenameUtils.removeExtension( f.getName() ) + ".cs" ) );
- }else if ( lastNCharsEqual( f.getName(), 8, ".aspx.cs" ) ) {
- vsf = new VisualStudioFile( f, BuildAction.Compile, relativePath, SubType.AspxCodeBehind, new DependentUpon( FilenameUtils.removeExtension( f.getName() ) ) );
- //add normal .asax.cs file
- }else if ( lastNCharsEqual( f.getName(), 8, ".asax.cs" ) ) {
- vsf = new VisualStudioFile( f, BuildAction.Compile, relativePath, SubType.Code, new DependentUpon( FilenameUtils.removeExtension( f.getName() ) ) );
- //add normal .asax file
- }else if ( lastNCharsEqual( f.getName(), 5, ".asax" ) ) {
- vsf = new VisualStudioFile( f, BuildAction.Content, relativePath, SubType.Component );
- //add normal .cs file
- }else if ( lastNCharsEqual( f.getName(), 10, ".asax.resx" ) ) {
- vsf = new VisualStudioFile( f, BuildAction.EmbeddedResources, relativePath, new DependentUpon( FilenameUtils.removeExtension( f.getName() ) + ".cs" ) );
- //add normal .cs file
- }else if ( lastNCharsEqual( f.getName(), 3, ".cs" ) && ( ! lastNCharsEqual( f.getName(), 8, ".aspx.cs") ) ) {
- vsf = new VisualStudioFile( f, BuildAction.Compile, relativePath, SubType.Code );
- //add normal .aspx file.
- }else if ( lastNCharsEqual( f.getName(), 5, ".aspx") ){
- vsf = new VisualStudioFile( f, BuildAction.Content, relativePath, SubType.Form );
- }
-
- return vsf;
+ private static VisualStudioFile create( File f, String relativePath )
+ {
+
+ VisualStudioFile vsf = null;
+
+ if ( lastNCharsEqual( f.getName(), 10, ".aspx.resx" ) )
+ {
+ //add .resx for aspx file
+ vsf = new VisualStudioFile( f, BuildAction.EmbeddedResources, relativePath,
+ new DependentUpon( FilenameUtils.removeExtension( f.getName() ) + ".cs" ) );
+ }
+ else if ( lastNCharsEqual( f.getName(), 8, ".aspx.cs" ) )
+ {
+ vsf = new VisualStudioFile( f, BuildAction.Compile, relativePath, SubType.AspxCodeBehind,
+ new DependentUpon( FilenameUtils.removeExtension( f.getName() ) ) );
+ //add normal .asax.cs file
+ }
+ else if ( lastNCharsEqual( f.getName(), 8, ".asax.cs" ) )
+ {
+ vsf = new VisualStudioFile( f, BuildAction.Compile, relativePath, SubType.Code,
+ new DependentUpon( FilenameUtils.removeExtension( f.getName() ) ) );
+ //add normal .asax file
+ }
+ else if ( lastNCharsEqual( f.getName(), 5, ".asax" ) )
+ {
+ vsf = new VisualStudioFile( f, BuildAction.Content, relativePath, SubType.Component );
+ //add normal .cs file
+ }
+ else if ( lastNCharsEqual( f.getName(), 10, ".asax.resx" ) )
+ {
+ vsf = new VisualStudioFile( f, BuildAction.EmbeddedResources, relativePath,
+ new DependentUpon( FilenameUtils.removeExtension( f.getName() ) + ".cs" ) );
+ //add normal .cs file
+ }
+ else if ( lastNCharsEqual( f.getName(), 3, ".cs" ) && ( !lastNCharsEqual( f.getName(), 8, ".aspx.cs" ) ) )
+ {
+ vsf = new VisualStudioFile( f, BuildAction.Compile, relativePath, SubType.Code );
+ //add normal .aspx file.
+ }
+ else if ( lastNCharsEqual( f.getName(), 5, ".aspx" ) )
+ {
+ vsf = new VisualStudioFile( f, BuildAction.Content, relativePath, SubType.Form );
+ }
+
+ return vsf;
}
-
- private static boolean lastNCharsEqual( String s, int n, String equalTo ){
- if( s.length() < n ) return false;
- if(StringUtils.right( s, n ).equals( equalTo ) ) return true;
- else return false;
+
+ private static boolean lastNCharsEqual( String s, int n, String equalTo )
+ {
+ if ( s.length() < n )
+ {
+ return false;
+ }
+ if ( StringUtils.right( s, n ).equals( equalTo ) )
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
}
-
- private static String[] getStringArrayFromSet(Set setOfStrings){
- return (String[]) setOfStrings.toArray( new String[ setOfStrings.size() ] );
+
+ private static String[] getStringArrayFromSet( Set setOfStrings )
+ {
+ return (String[]) setOfStrings.toArray( new String[setOfStrings.size()] );
}
-
-
-
-
- public static VisualStudioFile[] getResourceFiles(File baseDir, List resourceFiles) {
-
- ArrayList list = new ArrayList();
-
- if( resourceFiles == null || resourceFiles.size() == 0 ) return new VisualStudioFile[0];
-
- for( Iterator i = resourceFiles.iterator();i.hasNext();){
-
- DirectoryScanner scanner = new DirectoryScanner();
-
- Resource r = (Resource) i.next();
-
- if( r == null ) return new VisualStudioFile[0];
-
- File rootDir = new File( r.getDirectory() );
-
- if( ! rootDir.exists() || ! rootDir.isDirectory() ) break;
-
- scanner.setBasedir( rootDir );
-
- if( r.getIncludes() == null || r.getIncludes().isEmpty() )
- scanner.setIncludes( DEFAULT_INCLUDES );
- else
- scanner.setIncludes( (String[]) r.getIncludes().toArray( new String[ r.getIncludes().size() ] ) );
-
- if( r.getExcludes() == null || r.getExcludes().isEmpty() )
- scanner.setExcludes( EMPTY_STRING_ARRAY );
- else
- scanner.setExcludes( (String[]) r.getExcludes().toArray( new String[ r.getExcludes().size() ] ) );
-
- scanner.addDefaultExcludes();
- scanner.scan();
-
- List includedFiles = Arrays.asList( scanner.getIncludedFiles() );
-
- for ( Iterator j = includedFiles.iterator(); j.hasNext(); )
- {
- String relativePath = (String) j.next();
-
- File f = new File( rootDir, relativePath );
-
- String relativeToProjectRoot = toRelativeAndFixSeparator( baseDir, f.getAbsolutePath(), false );
-
- VisualStudioFile file = new VisualStudioFile( f, BuildAction.Content, relativeToProjectRoot, SubType.Null );
-
- list.add( file );
- }
- }
-
- return (VisualStudioFile[] )list.toArray( new VisualStudioFile[ list.size() ] );
+
+
+ public static VisualStudioFile[] getResourceFiles( File baseDir, List resourceFiles )
+ {
+
+ ArrayList list = new ArrayList();
+
+ if ( resourceFiles == null || resourceFiles.size() == 0 )
+ {
+ return new VisualStudioFile[0];
+ }
+
+ for ( Iterator i = resourceFiles.iterator(); i.hasNext(); )
+ {
+
+ DirectoryScanner scanner = new DirectoryScanner();
+
+ Resource r = (Resource) i.next();
+
+ if ( r == null )
+ {
+ return new VisualStudioFile[0];
+ }
+
+ File rootDir = new File( r.getDirectory() );
+
+ if ( !rootDir.exists() || !rootDir.isDirectory() )
+ {
+ break;
+ }
+
+ scanner.setBasedir( rootDir );
+
+ if ( r.getIncludes() == null || r.getIncludes().isEmpty() )
+ {
+ scanner.setIncludes( DEFAULT_INCLUDES );
+ }
+ else
+ {
+ scanner.setIncludes( (String[]) r.getIncludes().toArray( new String[r.getIncludes().size()] ) );
+ }
+
+ if ( r.getExcludes() == null || r.getExcludes().isEmpty() )
+ {
+ scanner.setExcludes( EMPTY_STRING_ARRAY );
+ }
+ else
+ {
+ scanner.setExcludes( (String[]) r.getExcludes().toArray( new String[r.getExcludes().size()] ) );
+ }
+
+ scanner.addDefaultExcludes();
+ scanner.scan();
+
+ List includedFiles = Arrays.asList( scanner.getIncludedFiles() );
+
+ for ( Iterator j = includedFiles.iterator(); j.hasNext(); )
+ {
+ String relativePath = (String) j.next();
+
+ File f = new File( rootDir, relativePath );
+
+ String relativeToProjectRoot = toRelativeAndFixSeparator( baseDir, f.getAbsolutePath(), false );
+
+ VisualStudioFile file =
+ new VisualStudioFile( f, BuildAction.Content, relativeToProjectRoot, SubType.Null );
+
+ list.add( file );
+ }
+ }
+
+ return (VisualStudioFile[]) list.toArray( new VisualStudioFile[list.size()] );
}
-
-
+
// if ( resource.getIncludes() != null && !resource.getIncludes().isEmpty() )
// {
// scanner.setIncludes( (String[]) resource.getIncludes().toArray( EMPTY_STRING_ARRAY ) );
@@ -228,11 +294,9 @@
// {
// scanner.setExcludes( (String[]) resource.getExcludes().toArray( EMPTY_STRING_ARRAY ) );
// }
-
+
//String destination = name;
-
-
// if ( targetPath != null )
// {
// destination = targetPath + "/" + name;
@@ -255,6 +319,6 @@
// {
// throw new MojoExecutionException( "Error copying resources", e );
// }
-
-
+
+
}
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003CSharpWriter.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003CSharpWriter.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003CSharpWriter.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003CSharpWriter.java Thu Nov 9 22:46:42 2006
@@ -1,7 +1,6 @@
package org.apache.maven.plugin.vstudio.xml;
import org.apache.maven.plugin.logging.Log;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.XMLWriter;
/*
@@ -14,18 +13,21 @@
* ProjectGuid = "{E6E60F5C-A28D-4B3F-A01C-A334F848B9BE}">
*
*/
-public class VisualStudio2003CSharpWriter {
+public class VisualStudio2003CSharpWriter
+{
+
+ private Log log = null;
+
+ public VisualStudio2003CSharpWriter( Log log )
+ {
+ this.log = log;
+ }
+
+ public void write( XMLWriter writer, String projectType, String schemaVersion, String productVersion,
+ String projectGuid )
+ {
+
+ }
+
- private Log log = null;
-
- public VisualStudio2003CSharpWriter( Log log ){
- this.log = log;
- }
-
- public void write(XMLWriter writer, String projectType, String schemaVersion, String productVersion, String projectGuid){
-
-
- }
-
-
}
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003ConfigWriter.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003ConfigWriter.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003ConfigWriter.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003ConfigWriter.java Thu Nov 9 22:46:42 2006
@@ -6,85 +6,86 @@
/**
- *
- * <Config
- Name = "Debug"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "DEBUG;TRACE"
- DocumentationFile = ""
- DebugSymbols = "true"
- FileAlignment = "4096"
- IncrementalBuild = "false"
- NoStdLib = "false"
- NoWarn = ""
- Optimize = "false"
- OutputPath = "bin\Debug\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- *
- * @author stevenc
+ * <Config
+ * Name = "Debug"
+ * AllowUnsafeBlocks = "false"
+ * BaseAddress = "285212672"
+ * CheckForOverflowUnderflow = "false"
+ * ConfigurationOverrideFile = ""
+ * DefineConstants = "DEBUG;TRACE"
+ * DocumentationFile = ""
+ * DebugSymbols = "true"
+ * FileAlignment = "4096"
+ * IncrementalBuild = "false"
+ * NoStdLib = "false"
+ * NoWarn = ""
+ * Optimize = "false"
+ * OutputPath = "bin\Debug\"
+ * RegisterForComInterop = "false"
+ * RemoveIntegerChecks = "false"
+ * TreatWarningsAsErrors = "false"
+ * WarningLevel = "4"
+ * />
*
+ * @author stevenc
*/
-public class VisualStudio2003ConfigWriter {
+public class VisualStudio2003ConfigWriter
+{
+
+ private Log log = null;
+
+ public VisualStudio2003ConfigWriter( Log log )
+ {
+ this.log = log;
+ }
+
+ public void write( XMLWriter writer, ProjectSettings settings )
+ {
+
+ writer.startElement( "Config" );
+ writer.addAttribute( "Name", "Debug" );
+ writer.addAttribute( "AllowUnsafeBlocks", "false" );
+ //writer.addAttribute("BaseAddress", "285212672" );
+ writer.addAttribute( "CheckForOverflowUnderflow", "false" );
+ writer.addAttribute( "ConfigurationOverrideFile", "" );
+ writer.addAttribute( "DefineConstants", "DEBUG;TRACE" );
+ writer.addAttribute( "DocumentationFile", "" );
+ writer.addAttribute( "DebugSymbols", "true" );
+ writer.addAttribute( "FileAlignment", "4096" );
+ writer.addAttribute( "IncrementalBuild", "false" );
+ writer.addAttribute( "NoStdLib", "false" );
+ writer.addAttribute( "NoWarn", "" );
+ writer.addAttribute( "Optimize", "false" );
+ writer.addAttribute( "OutputPath", "target\\dotnet-assembly\\" );
+ writer.addAttribute( "RegisterForComInterop", "false" );
+ writer.addAttribute( "RemoveIntegerChecks", "false" );
+ writer.addAttribute( "TreatWarningsAsErrors", "false" );
+ writer.addAttribute( "WarningLevel", "4" );
+
+ writer.endElement();
+
+ writer.startElement( "Config" );
+ writer.addAttribute( "Name", "Release" );
+ writer.addAttribute( "AllowUnsafeBlocks", "false" );
+ //writer.addAttribute("BaseAddress", "285212672" );
+ writer.addAttribute( "CheckForOverflowUnderflow", "false" );
+ writer.addAttribute( "ConfigurationOverrideFile", "" );
+ writer.addAttribute( "DefineConstants", "TRACE" );
+ writer.addAttribute( "DocumentationFile", settings.getProjectName() + ".xml" );
+ writer.addAttribute( "DebugSymbols", "false" );
+ writer.addAttribute( "FileAlignment", "4096" );
+ writer.addAttribute( "IncrementalBuild", "false" );
+ writer.addAttribute( "NoStdLib", "false" );
+ writer.addAttribute( "NoWarn", "" );
+ writer.addAttribute( "Optimize", "true" );
+ writer.addAttribute( "OutputPath", "target\\dotnet-assembly\\" );
+ writer.addAttribute( "RegisterForComInterop", "false" );
+ writer.addAttribute( "RemoveIntegerChecks", "false" );
+ writer.addAttribute( "TreatWarningsAsErrors", "false" );
+ writer.addAttribute( "WarningLevel", "4" );
+
+ writer.endElement();
+ }
- private Log log = null;
-
- public VisualStudio2003ConfigWriter( Log log ){
- this.log = log;
- }
-
- public void write(XMLWriter writer, ProjectSettings settings){
-
- writer.startElement("Config");
- writer.addAttribute("Name", "Debug" );
- writer.addAttribute("AllowUnsafeBlocks", "false" );
- //writer.addAttribute("BaseAddress", "285212672" );
- writer.addAttribute("CheckForOverflowUnderflow", "false" );
- writer.addAttribute("ConfigurationOverrideFile", "" );
- writer.addAttribute("DefineConstants", "DEBUG;TRACE" );
- writer.addAttribute("DocumentationFile", "" );
- writer.addAttribute("DebugSymbols", "true" );
- writer.addAttribute("FileAlignment", "4096" );
- writer.addAttribute("IncrementalBuild", "false" );
- writer.addAttribute("NoStdLib", "false" );
- writer.addAttribute("NoWarn", "" );
- writer.addAttribute("Optimize", "false" );
- writer.addAttribute("OutputPath", "target\\dotnet-assembly\\" );
- writer.addAttribute("RegisterForComInterop", "false" );
- writer.addAttribute("RemoveIntegerChecks", "false" );
- writer.addAttribute("TreatWarningsAsErrors", "false" );
- writer.addAttribute("WarningLevel", "4" );
-
- writer.endElement();
-
- writer.startElement("Config");
- writer.addAttribute("Name", "Release" );
- writer.addAttribute("AllowUnsafeBlocks", "false" );
- //writer.addAttribute("BaseAddress", "285212672" );
- writer.addAttribute("CheckForOverflowUnderflow", "false" );
- writer.addAttribute("ConfigurationOverrideFile", "" );
- writer.addAttribute("DefineConstants", "TRACE" );
- writer.addAttribute("DocumentationFile", settings.getProjectName() + ".xml" );
- writer.addAttribute("DebugSymbols", "false" );
- writer.addAttribute("FileAlignment", "4096" );
- writer.addAttribute("IncrementalBuild", "false" );
- writer.addAttribute("NoStdLib", "false" );
- writer.addAttribute("NoWarn", "" );
- writer.addAttribute("Optimize", "true" );
- writer.addAttribute("OutputPath", "target\\dotnet-assembly\\" );
- writer.addAttribute("RegisterForComInterop", "false" );
- writer.addAttribute("RemoveIntegerChecks", "false" );
- writer.addAttribute("TreatWarningsAsErrors", "false" );
- writer.addAttribute("WarningLevel", "4" );
-
- writer.endElement();
- }
-
}
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003FileWriter.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003FileWriter.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003FileWriter.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003FileWriter.java Thu Nov 9 22:46:42 2006
@@ -1,7 +1,5 @@
package org.apache.maven.plugin.vstudio.xml;
-import java.io.File;
-
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.vstudio.ProjectSettings;
import org.apache.maven.plugin.vstudio.SubType;
@@ -9,95 +7,110 @@
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.XMLWriter;
-public class VisualStudio2003FileWriter {
+public class VisualStudio2003FileWriter
+{
+
+ private Log log = null;
+
+ public VisualStudio2003FileWriter( Log log )
+ {
+ this.log = log;
+ }
+
+ public void write( XMLWriter writer, ProjectSettings settings, VisualStudioFile[] source,
+ VisualStudioFile[] testSource, VisualStudioFile[] resources, VisualStudioFile pom )
+ {
+
+ writer.startElement( "Files" );
+ writer.startElement( "Include" );
+
+ log.debug( "----------------Adding files-------------------" );
+
+ //-----------------------------------------
+ //write out sources to .proj file.
+ //-----------------------------------------
+
+ for ( int i = 0; i < source.length; i++ )
+ {
+
+ log.info( "Adding source:" + source[i].getRelativePath() );
+
+ writer.startElement( "File" );
+ writer.addAttribute( "RelPath", source[i].getRelativePath() );
+
+ if ( ( source[i].getDependent() != null ) &&
+ ( !StringUtils.isEmpty( source[i].getDependent().getFileName() ) ) )
+ {
+ writer.addAttribute( "DependentUpon", source[i].getDependent().getFileName() );
+ }
+
+ if ( source[i].getSub() != null && ( !source[i].getSub().equals( SubType.Null ) ) )
+ {
+ writer.addAttribute( "SubType", source[i].getSub().toString() );
+ }
+
+ writer.addAttribute( "BuildAction", source[i].getAction().toString() );
+ writer.endElement();
+ }
+
+ //-----------------------------------------
+ //write out test sources to .proj file.
+ //-----------------------------------------
+
+ for ( int i = 0; i < testSource.length; i++ )
+ {
+
+ log.info( "Adding test source:" + testSource[i].getRelativePath() );
+
+ writer.startElement( "File" );
+ writer.addAttribute( "RelPath", testSource[i].getRelativePath() );
+
+ if ( !testSource[i].getSub().equals( SubType.Null ) )
+ {
+ writer.addAttribute( "SubType", testSource[i].getSub().toString() );
+ }
+
+ writer.addAttribute( "BuildAction", testSource[i].getAction().toString() );
+ writer.endElement();
+ }
+
+ //-----------------------------------------
+ //write out resources to .proj file.
+ //-----------------------------------------
+
+ for ( int i = 0; i < resources.length; i++ )
+ {
+
+ log.info( "Adding resource:" + resources[i].getRelativePath() );
+
+ writer.startElement( "File" );
+ writer.addAttribute( "RelPath", resources[i].getRelativePath() );
+
+ if ( !resources[i].getSub().equals( SubType.Null ) )
+ {
+ writer.addAttribute( "SubType", resources[i].getSub().toString() );
+ }
+
+ writer.addAttribute( "BuildAction", resources[i].getAction().toString() );
+ writer.endElement();
+ }
+
+ log.info( "Adding pom:" + pom.getRelativePath() );
+
+ writer.startElement( "File" );
+ writer.addAttribute( "RelPath", pom.getRelativePath() );
+
+ if ( !pom.getSub().equals( SubType.Null ) )
+ {
+ writer.addAttribute( "SubType", pom.getSub().toString() );
+ }
+
+ writer.addAttribute( "BuildAction", pom.getAction().toString() );
+ writer.endElement();
- private Log log = null;
-
- public VisualStudio2003FileWriter(Log log){
- this.log = log;
- }
-
- public void write(XMLWriter writer, ProjectSettings settings,
- VisualStudioFile[] source, VisualStudioFile[] testSource,
- VisualStudioFile[] resources, VisualStudioFile pom){
-
- writer.startElement("Files");
- writer.startElement("Include");
-
- log.debug("----------------Adding files-------------------");
-
- //-----------------------------------------
- //write out sources to .proj file.
- //-----------------------------------------
-
- for(int i=0;i<source.length;i++){
-
- log.info("Adding source:" + source[i].getRelativePath() );
-
- writer.startElement("File");
- writer.addAttribute("RelPath", source[i].getRelativePath() );
-
- if( ( source[i].getDependent() != null ) && (! StringUtils.isEmpty(source[i].getDependent().getFileName() ) ) )
- writer.addAttribute("DependentUpon", source[i].getDependent().getFileName() );
-
- if( source[i].getSub() != null && ( ! source[i].getSub().equals( SubType.Null ) ) )
- writer.addAttribute("SubType", source[i].getSub().toString() );
-
- writer.addAttribute("BuildAction", source[i].getAction().toString() );
- writer.endElement();
- }
-
- //-----------------------------------------
- //write out test sources to .proj file.
- //-----------------------------------------
-
- for(int i=0;i<testSource.length;i++){
-
- log.info("Adding test source:" + testSource[i].getRelativePath() );
-
- writer.startElement("File");
- writer.addAttribute("RelPath", testSource[i].getRelativePath() );
-
- if( ! testSource[i].getSub().equals( SubType.Null ) )
- writer.addAttribute("SubType", testSource[i].getSub().toString() );
-
- writer.addAttribute("BuildAction", testSource[i].getAction().toString() );
- writer.endElement();
- }
-
- //-----------------------------------------
- //write out resources to .proj file.
- //-----------------------------------------
-
- for(int i=0;i<resources.length;i++){
-
- log.info("Adding resource:" + resources[i].getRelativePath() );
-
- writer.startElement("File");
- writer.addAttribute("RelPath", resources[i].getRelativePath() );
-
- if( ! resources[i].getSub().equals( SubType.Null ) )
- writer.addAttribute("SubType", resources[i].getSub().toString() );
-
- writer.addAttribute("BuildAction", resources[i].getAction().toString() );
- writer.endElement();
- }
-
- log.info("Adding pom:" + pom.getRelativePath() );
-
- writer.startElement("File");
- writer.addAttribute("RelPath", pom.getRelativePath() );
-
- if( ! pom.getSub().equals( SubType.Null ) )
- writer.addAttribute("SubType", pom.getSub().toString() );
-
- writer.addAttribute("BuildAction", pom.getAction().toString() );
- writer.endElement();
-
-
- //close Files and Includes elements
- writer.endElement();
- writer.endElement();
- }
+ //close Files and Includes elements
+ writer.endElement();
+ writer.endElement();
+ }
}
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003ReferenceWriter.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003ReferenceWriter.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003ReferenceWriter.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003ReferenceWriter.java Thu Nov 9 22:46:42 2006
@@ -140,5 +140,5 @@
return false;
}
}
-
+
}
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003SettingsWriter.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003SettingsWriter.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003SettingsWriter.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003SettingsWriter.java Thu Nov 9 22:46:42 2006
@@ -2,66 +2,62 @@
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.vstudio.ProjectSettings;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.XMLWriter;
/**
- *
- * <Settings
- ApplicationIcon = ""
- AssemblyKeyContainerName = ""
- AssemblyName = "DrKW.CPDS.Proxy.Authorisation"
- AssemblyOriginatorKeyFile = ""
- DefaultClientScript = "JScript"
- DefaultHTMLPageLayout = "Grid"
- DefaultTargetSchema = "IE50"
- DelaySign = "false"
- OutputType = "Library"
- PreBuildEvent = ""
- PostBuildEvent = ""
- RootNamespace = "DrKW.CPDS.Proxy.Authorisation"
- RunPostBuildEvent = "OnBuildSuccess"
- StartupObject = ""
- >
- *
- *
- * @author stevenc
+ * <Settings
+ * ApplicationIcon = ""
+ * AssemblyKeyContainerName = ""
+ * AssemblyName = "DrKW.CPDS.Proxy.Authorisation"
+ * AssemblyOriginatorKeyFile = ""
+ * DefaultClientScript = "JScript"
+ * DefaultHTMLPageLayout = "Grid"
+ * DefaultTargetSchema = "IE50"
+ * DelaySign = "false"
+ * OutputType = "Library"
+ * PreBuildEvent = ""
+ * PostBuildEvent = ""
+ * RootNamespace = "DrKW.CPDS.Proxy.Authorisation"
+ * RunPostBuildEvent = "OnBuildSuccess"
+ * StartupObject = ""
+ * >
*
+ * @author stevenc
*/
-public class VisualStudio2003SettingsWriter {
+public class VisualStudio2003SettingsWriter
+{
+
+ private Log log = null;
+
+ public VisualStudio2003SettingsWriter( Log log )
+ {
+
+ }
+
+ public void write( XMLWriter writer, ProjectSettings settings )
+ {
+
+ writer.startElement( "Settings" );
+ writer.addAttribute( "ApplicationIcon", settings.getApplicationIcon() );
+ writer.addAttribute( "AssemblyKeyContainerName", settings.getAssemblyKeyContainerName() );
+ writer.addAttribute( "AssemblyName", settings.getAssemblyName() );
+ writer.addAttribute( "AssemblyOriginatorKeyFile", settings.getAssemblyOriginatorKeyFile() );
+ writer.addAttribute( "DefaultClientScript", settings.getDefaultClientScript() );
+ writer.addAttribute( "DefaultHTMLPageLayout", settings.getDefaultHTMLPageLayout() );
+ writer.addAttribute( "DefaultTargetSchema", settings.getDefaultTargetSchema() );
+ writer.addAttribute( "DelaySign", settings.getDelaySign() );
+ writer.addAttribute( "OutputType", settings.getOutputType() );
+ writer.addAttribute( "PreBuildEvent", settings.getPreBuildEvent() );
+ writer.addAttribute( "PostBuildEvent", settings.getPostBuildEvent() );
+ writer.addAttribute( "RootNamespace", settings.getRootNamespace() );
+ writer.addAttribute( "RunPostBuildEvent", settings.getRunPostBuildEvent() );
+ writer.addAttribute( "StartupObject", settings.getStartupObject() );
+
+ writer.endElement();
+
+ }
+
- private Log log = null;
-
- public VisualStudio2003SettingsWriter(Log log){
-
- }
-
- public void write(XMLWriter writer, ProjectSettings settings){
-
- writer.startElement("Settings");
- writer.addAttribute("ApplicationIcon", settings.getApplicationIcon() );
- writer.addAttribute("AssemblyKeyContainerName", settings.getAssemblyKeyContainerName() );
- writer.addAttribute("AssemblyName", settings.getAssemblyName() );
- writer.addAttribute("AssemblyOriginatorKeyFile", settings.getAssemblyOriginatorKeyFile() );
- writer.addAttribute("DefaultClientScript", settings.getDefaultClientScript() );
- writer.addAttribute("DefaultHTMLPageLayout", settings.getDefaultHTMLPageLayout() );
- writer.addAttribute("DefaultTargetSchema", settings.getDefaultTargetSchema() );
- writer.addAttribute("DelaySign", settings.getDelaySign() );
- writer.addAttribute("OutputType", settings.getOutputType() );
- writer.addAttribute("PreBuildEvent", settings.getPreBuildEvent() );
- writer.addAttribute("PostBuildEvent", settings.getPostBuildEvent() );
- writer.addAttribute("RootNamespace", settings.getRootNamespace() );
- writer.addAttribute("RunPostBuildEvent", settings.getRunPostBuildEvent() );
- writer.addAttribute("StartupObject", settings.getStartupObject() );
-
- writer.endElement();
-
- }
-
-
-
-
-
}
Modified: maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003WebInfoWriter.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003WebInfoWriter.java?view=diff&rev=473208&r1=473207&r2=473208
==============================================================================
--- maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003WebInfoWriter.java (original)
+++ maven/sandbox/plugins/maven-vstudio-plugin/src/main/java/org/apache/maven/plugin/vstudio/xml/VisualStudio2003WebInfoWriter.java Thu Nov 9 22:46:42 2006
@@ -3,23 +3,26 @@
import org.apache.maven.plugin.logging.Log;
import org.codehaus.plexus.util.xml.XMLWriter;
-public class VisualStudio2003WebInfoWriter {
+public class VisualStudio2003WebInfoWriter
+{
- private Log log = null;
-
- public VisualStudio2003WebInfoWriter( Log log ){
- this.log = log;
- }
-
- public void write(XMLWriter writer, String webProjectUrl){
-
- writer.startElement("VisualStudioUNCWeb");
-
- writer.startElement("Web");
- writer.addAttribute("URLPath", webProjectUrl);
-
- writer.endElement(); //end Web
-
- writer.endElement();//end VisualStudioUNCWeb
- }
+ private Log log = null;
+
+ public VisualStudio2003WebInfoWriter( Log log )
+ {
+ this.log = log;
+ }
+
+ public void write( XMLWriter writer, String webProjectUrl )
+ {
+
+ writer.startElement( "VisualStudioUNCWeb" );
+
+ writer.startElement( "Web" );
+ writer.addAttribute( "URLPath", webProjectUrl );
+
+ writer.endElement(); //end Web
+
+ writer.endElement();//end VisualStudioUNCWeb
+ }
}