[jboss-svn-commits] JBL Code SVN: r31449 - in labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk: src/main and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 5 07:48:17 EST 2010
Author: lkrzyzanek
Date: 2010-02-05 07:48:16 -0500 (Fri, 05 Feb 2010)
New Revision: 31449
Added:
labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/deploy.pom
labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/assembly/
labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/assembly/assembly-plugin.xml
labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/plugin/
labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/plugin/plugin.xml
labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/plugin/spring.xml
Removed:
labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/resources/plugin.xml
labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/resources/spring.xml
labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/web/
Modified:
labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/
labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/pom.xml
Log:
Changed to be compatible with SBS 4.x
Property changes on: labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk
___________________________________________________________________
Name: svn:ignore
- .project
.classpath
.settings
+ .project
.classpath
.settings
target
Added: labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/deploy.pom
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/deploy.pom (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/deploy.pom 2010-02-05 12:48:16 UTC (rev 31449)
@@ -0,0 +1,29 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>dummy</groupId>
+ <artifactId>wagn-svn-deploy-pom</artifactId>
+ <packaging>pom</packaging>
+ <version>1</version>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.jvnet.wagon-svn</groupId>
+ <artifactId>wagon-svn</artifactId>
+ <version>1.8</version>
+ </extension>
+ </extensions>
+ </build>
+
+
+ <repositories>
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ </repositories>
+
+
+
+</project>
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/pom.xml 2010-02-05 12:42:55 UTC (rev 31448)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/pom.xml 2010-02-05 12:48:16 UTC (rev 31449)
@@ -3,11 +3,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.labs.clearspace.plugin</groupId>
+ <groupId>org.jboss.labs.sbs.plugin</groupId>
<artifactId>wiki</artifactId>
- <name>Clearspace plugin: Wiki markup support</name>
- <description>Clearspace Wiki Markup macro</description>
- <version>1.0.0</version>
+ <name>SBS plugin: Wiki markup support</name>
+ <description>SBS Wiki Markup macro</description>
+ <version>2.0.0</version>
<parent>
<groupId>org.jboss.labs</groupId>
@@ -17,118 +17,166 @@
</parent>
<build>
+ <finalName>wiki-plugin</finalName>
<plugins>
+ <!-- For compilation-->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
+ <!-- Weave transactions into the plugin -->
<plugin>
- <groupId>com.jivesoftware.maven</groupId>
- <artifactId>maven-clearspace-plugin-packager</artifactId>
- <version>2.1</version>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>aspectj-maven-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <aspectLibraries>
+ <aspectLibrary>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aspects</artifactId>
+ </aspectLibrary>
+ </aspectLibraries>
+ <source>1.6</source>
+ </configuration>
<executions>
<execution>
<goals>
- <goal>package-plugin</goal>
+ <goal>compile</goal>
</goals>
- <phase>package</phase>
</execution>
</executions>
</plugin>
+
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <finalName>tmp-classes</finalName>
- </configuration>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/assembly-plugin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
<executions>
<execution>
- <id>rename-exploded</id>
+ <!--
+ Unpackages this SBS plugin. That way it can be used in
+ conjunction with the -DpluginDirs= property, which
+ bypasses the standard plugin installation (which happens
+ via the admin console), by pointing to exploded plugin jar
+ created by this.
+ -->
+ <id>explode-sbs-plugin</id>
+ <phase>package</phase>
<goals>
<goal>run</goal>
</goals>
- <phase>package</phase>
<configuration>
<tasks>
- <delete>
- <fileset dir="target" includes="tmp-classes*" />
- </delete>
+ <mkdir dir="${basedir}/target/wiki" />
+ <unjar
+ src="${basedir}/target/wiki-plugin.jar"
+ dest="${basedir}/target/wiki" />
</tasks>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- For unit testing -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/selenium/*Test.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
-
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
+ <groupId>com.jivesoftware</groupId>
+ <artifactId>jive-sbs-employee</artifactId>
+ <version>${sbs.version}</version>
+ <type>jar</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.jivesoftware</groupId>
- <artifactId>clearspace-all</artifactId>
- <version>2.5.14</version>
+ <artifactId>jive-sbs-employee-all</artifactId>
+ <version>${sbs.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <type>jar</type>
+ <scope>provided</scope>
+ </dependency>
+ <!-- The following dependencies are for unit testing-->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <version>2.4.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+ <!--
+ This is where you set the Jive SBS version your plugin is compiled
+ against.
+ -->
+ <properties>
+ <sbs.version>4.0.3</sbs.version>
+ </properties>
- <pluginRepositories>
- <pluginRepository>
- <id>jive.internal</id>
- <name>Jive Repository</name>
- <url>http://maven-secure.jivesoftware.com/archiva/repository/jive.internal/</url>
- </pluginRepository>
- <pluginRepository>
- <id>jive.internal</id>
- <name>Jive Snapshot Repository</name>
- <url>http://maven-secure.jivesoftware.com/archiva/repository/jive.snapshots/</url>
- </pluginRepository>
- </pluginRepositories>
- <repositories>
- <repository>
- <id>jive.internal</id>
- <name>Jive Repository</name>
- <url>http://maven-secure.jivesoftware.com/archiva/repository/jive.internal/</url>
- </repository>
- <repository>
- <id>jive.internal</id>
- <name>Jive Snapshot Repository</name>
- <url>http://maven-secure.jivesoftware.com/archiva/repository/jive.snapshots/</url>
- </repository>
- </repositories>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
</project>
Added: labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/assembly/assembly-plugin.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/assembly/assembly-plugin.xml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/assembly/assembly-plugin.xml 2010-02-05 12:48:16 UTC (rev 31449)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+ <id>plugin</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>classes/</include>
+ </includes>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/plugin</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>resources/templates/</exclude>
+ </excludes>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/plugin/resources/templates</directory>
+ <outputDirectory>/resources/templates</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Property changes on: labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/assembly/assembly-plugin.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/plugin (from rev 30968, labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/web)
Copied: labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/plugin/plugin.xml (from rev 30968, labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/resources/plugin.xml)
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/plugin/plugin.xml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/plugin/plugin.xml 2010-02-05 12:48:16 UTC (rev 31449)
@@ -0,0 +1,20 @@
+<plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.jivesoftware.com/schemas/clearspace/2_5/plugin.xsd">
+ <name>wiki</name>
+ <description>Wiki Markup</description>
+ <author>JBoss.org</author>
+ <version>1.0.0</version>
+ <minServerVersion>2.5.0</minServerVersion>
+
+ <!-- Plugin class -->
+ <class>org.jboss.labs.clearspace.plugin.wiki.WikiPlugin</class>
+
+ <!--
+ For using Wiki conversion for incoming mails set this property:
+ property
+ checkMail.integrationProvider.class=org.jboss.labs.clearspace.plugin.wiki.WikiIntegrationProvider
+ -->
+
+ <css src="/resources/wiki-plugin.css"/>
+
+</plugin>
Property changes on: labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/plugin/plugin.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/plugin/spring.xml (from rev 30968, labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/resources/spring.xml)
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/plugin/spring.xml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/plugin/spring.xml 2010-02-05 12:48:16 UTC (rev 31449)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+
+
+ <bean id="wikiPlugin" class="org.jboss.labs.clearspace.plugin.wiki.WikiPlugin">
+ <property name="renderManager" ref="globalRenderManager" />
+ <property name="wikiMacro" ref="wikiMacro" />
+ </bean>
+
+ <bean id="wikiMacro" class="org.jboss.labs.clearspace.plugin.wiki.WikiMacro">
+ <property name="button" value="true" />
+ </bean>
+
+</beans>
Property changes on: labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/plugin/spring.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/resources/plugin.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/resources/plugin.xml 2010-02-05 12:42:55 UTC (rev 31448)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/resources/plugin.xml 2010-02-05 12:48:16 UTC (rev 31449)
@@ -1,20 +0,0 @@
-<plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jivesoftware.com/schemas/clearspace/2_5/plugin.xsd">
- <name>wiki</name>
- <description>Wiki Markup</description>
- <author>JBoss.org</author>
- <version>1.0.0</version>
- <minServerVersion>2.5.0</minServerVersion>
-
- <!-- Plugin class -->
- <class>org.jboss.labs.clearspace.plugin.wiki.WikiPlugin</class>
-
- <!--
- For using Wiki conversion for incoming mails set this property:
- property
- checkMail.integrationProvider.class=org.jboss.labs.clearspace.plugin.wiki.WikiIntegrationProvider
- -->
-
- <css src="/resources/wiki-plugin.css"/>
-
-</plugin>
Deleted: labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/resources/spring.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/resources/spring.xml 2010-02-05 12:42:55 UTC (rev 31448)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-wiki/trunk/src/main/resources/spring.xml 2010-02-05 12:48:16 UTC (rev 31449)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
-
-
- <bean id="wikiPlugin" class="org.jboss.labs.clearspace.plugin.wiki.WikiPlugin">
- <property name="renderManager" ref="globalRenderManager" />
- <property name="wikiMacro" ref="wikiMacro" />
- </bean>
-
- <bean id="wikiMacro" class="org.jboss.labs.clearspace.plugin.wiki.WikiMacro">
- <property name="button" value="true" />
- </bean>
-
-</beans>
More information about the jboss-svn-commits
mailing list