Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

updating to latest cliforce snapshot

  • Loading branch information...
commit d1f51b516e6bd63f87b058c7d83181e7108119f1 1 parent da6dfad
@sclasen sclasen authored
View
208 pom.xml
@@ -1,107 +1,107 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.force.maven.plugin</groupId>
- <artifactId>maven-cliforce-plugin</artifactId>
- <packaging>maven-plugin</packaging>
- <version>0.0.2-SNAPSHOT</version>
- <name>maven-cliforce-plugin</name>
- <properties>
- <!--tests resource filtering on a script-->
- <plugin>plugin</plugin>
- <force.repo.url>http://repo.t.salesforce.com/archiva/repository/releases</force.repo.url>
- <force.repo.snapshot.url>http://repo.t.salesforce.com/archiva/repository/snapshots</force.repo.snapshot.url>
- </properties>
- <licenses>
- <license>
- <name>Apache 2</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
- <repositories>
- <repository>
- <id>force.repo</id>
- <name>Force.com Repository</name>
- <url>${force.repo.snapshot.url}</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>force.repo.snapshot</id>
- <name>Force.com Snapshot Repository</name>
- <url>${force.repo.snapshot.url}</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <distributionManagement>
- <repository>
- <id>force.repo</id>
- <name>Force.com Repository</name>
- <url>${force.repo.url}</url>
- </repository>
- <snapshotRepository>
- <id>force.repo.snapshot</id>
- <name>Force.com Snapshot Repository</name>
- <url>${force.repo.snapshot.url}</url>
- </snapshotRepository>
- </distributionManagement>
- <scm>
- <connection>scm:git:git://github.com/forcedotcom/maven-cliforce-plugin.git</connection>
- <developerConnection>scm:git:git@github.com:forcedotcom/maven-cliforce-plugin.git</developerConnection>
- <url>http://github.com/forcedotcom/maven-cliforce-plugin</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>3.0.2</version>
- </dependency>
- <dependency>
- <groupId>com.force.cliforce</groupId>
- <artifactId>cliforce</artifactId>
- <version>0.0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.force.maven.plugin</groupId>
+ <artifactId>maven-cliforce-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>0.0.3-SNAPSHOT</version>
+ <name>maven-cliforce-plugin</name>
+ <properties>
+ <!--tests resource filtering on a script-->
+ <plugin>plugin</plugin>
+ <force.repo.url>http://repo.t.salesforce.com/archiva/repository/releases</force.repo.url>
+ <force.repo.snapshot.url>http://repo.t.salesforce.com/archiva/repository/snapshots</force.repo.snapshot.url>
+ </properties>
+ <licenses>
+ <license>
+ <name>Apache 2</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
+ <repositories>
+ <repository>
+ <id>force.repo</id>
+ <name>Force.com Repository</name>
+ <url>${force.repo.url}</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>force.repo.snapshot</id>
+ <name>Force.com Snapshot Repository</name>
+ <url>${force.repo.snapshot.url}</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <distributionManagement>
+ <repository>
+ <id>force.repo</id>
+ <name>Force.com Repository</name>
+ <url>${force.repo.url}</url>
+ </repository>
+ <snapshotRepository>
+ <id>force.repo.snapshot</id>
+ <name>Force.com Snapshot Repository</name>
+ <url>${force.repo.snapshot.url}</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <scm>
+ <connection>scm:git:git://github.com/forcedotcom/maven-cliforce-plugin.git</connection>
+ <developerConnection>scm:git:git@github.com:forcedotcom/maven-cliforce-plugin.git</developerConnection>
+ <url>http://github.com/forcedotcom/maven-cliforce-plugin</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>3.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.force.cliforce</groupId>
+ <artifactId>cliforce</artifactId>
+ <version>0.0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
View
6 src/main/java/com/force/maven/plugin/CliforceMojo.java
@@ -40,21 +40,21 @@ public void execute()
try {
FileInputStream in = new FileInputStream(forceScript);
ForceEnv env = new ForceEnv(forceEnv);
- final CLIForce cliForce = new CLIForce(env);
+ final CLIForce cliForce = CLIForce.getInstance();
cliForce.init(in, new PrintWriter(System.out, true));
cliForce.run();
Thread.sleep(1000);
System.out.println();
} catch (FileNotFoundException e) {
getLog().error("forceScript file not found", e);
- } catch (ConnectionException e) {
- getLog().error("error initializing force connection", e);
} catch (ServletException e) {
getLog().error("error initializing force connection", e);
} catch (IOException e) {
getLog().error("error initializing force connection", e);
} catch (InterruptedException e) {
getLog().error(e);
+ } catch (ConnectionException e) {
+ getLog().error("Error initializing force connection", e);
}
} else {
View
8 src/test/resources/testForceScript.fs
@@ -1,8 +1,8 @@
-plugin -a cliplugin -v 1.0
+plugin cliplugin
cliplugin:hello
unplug cliplugin
help ${plugin}
-help ${project.artifactId}-${project.version}.${project.packaging}
-list
-apps
+help
+db:list
+app:apps
exit
Please sign in to comment.
Something went wrong with that request. Please try again.