[jboss-svn-commits] JBL Code SVN: r31569 - in labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk: src/main and 9 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Feb 11 11:17:20 EST 2010


Author: lkrzyzanek
Date: 2010-02-11 11:17:19 -0500 (Thu, 11 Feb 2010)
New Revision: 31569

Added:
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/assembly/
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/assembly/assembly-plugin.xml
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/cache-config.xml
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/plugin.xml
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/resources/
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/resources/templates/
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/resources/templates/admin/
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/schema.xml
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/spring.xml
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/struts.xml
Removed:
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/cache-config.xml
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/plugin.xml
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/schema.xml
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/spring.xml
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/struts.xml
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/web/admin/
Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/pom.xml
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesUserManager.java
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/NukesUserManager.java
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesUserBean.java
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/struts/RedirectNFToCSForumAction.java
Log:
Changed to work with SBS 4.0
Deleted content of method migrateForums because it's not needed any more.

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/pom.xml	2010-02-11 16:13:01 UTC (rev 31568)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/pom.xml	2010-02-11 16:17:19 UTC (rev 31569)
@@ -7,7 +7,7 @@
   <artifactId>nukes-forums-migration</artifactId>
   <name>Clearspace plugin: Nukes Forums migratjion</name>
   <description>Migration tool for movement Nukes Forums to Clearspace discussions</description>
-  <version>1.0.0</version>
+  <version>2.0.0</version>
 
   <parent>
     <groupId>org.jboss.labs</groupId>
@@ -15,75 +15,160 @@
     <version>1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
-
   <build>
+    <finalName>nukes-forums-migration-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/nukes-forums-migration" />
+                <unjar
+                  src="${basedir}/target/nukes-forums-migration-plugin.jar"
+                  dest="${basedir}/target/nukes-forums-migration" />
               </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>
+
     <!--  
       Portal format module (not mavenized) can be downloaded from:
       https://svn.jboss.org/repos/labs/labs/jbossforums/branches/multipleforums120P26//thirdparty/jbportal/lib/portal-format-lib.jar
@@ -97,33 +182,15 @@
       <artifactId>format</artifactId>
       <version>2.6</version>
     </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>

Added: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/assembly/assembly-plugin.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/assembly/assembly-plugin.xml	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/assembly/assembly-plugin.xml	2010-02-11 16:17:19 UTC (rev 31569)
@@ -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-nfm/trunk/src/main/assembly/assembly-plugin.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java	2010-02-11 16:13:01 UTC (rev 31568)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java	2010-02-11 16:17:19 UTC (rev 31569)
@@ -26,16 +26,13 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.StringTokenizer;
-import java.util.concurrent.LinkedBlockingQueue;
 
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
@@ -55,7 +52,6 @@
 
 import com.jivesoftware.base.UnauthorizedException;
 import com.jivesoftware.base.User;
-import com.jivesoftware.base.UserAlreadyExistsException;
 import com.jivesoftware.base.UserManager;
 import com.jivesoftware.base.UserNotFoundException;
 import com.jivesoftware.base.UserTemplate;
@@ -64,8 +60,6 @@
 import com.jivesoftware.community.ActivityBean;
 import com.jivesoftware.community.Announcement;
 import com.jivesoftware.community.AnnouncementManager;
-import com.jivesoftware.community.Comment;
-import com.jivesoftware.community.CommentDelegator;
 import com.jivesoftware.community.Community;
 import com.jivesoftware.community.CommunityManager;
 import com.jivesoftware.community.CommunityNotFoundException;
@@ -73,7 +67,6 @@
 import com.jivesoftware.community.ForumManager;
 import com.jivesoftware.community.ForumMessage;
 import com.jivesoftware.community.ForumThread;
-import com.jivesoftware.community.JiveConstants;
 import com.jivesoftware.community.JiveContainer;
 import com.jivesoftware.community.JiveContentObject;
 import com.jivesoftware.community.JiveObject;
@@ -84,12 +77,6 @@
 import com.jivesoftware.community.TagManager;
 import com.jivesoftware.community.TagObjectNotFoundException;
 import com.jivesoftware.community.WatchManager;
-import com.jivesoftware.community.cache.CacheFactory;
-import com.jivesoftware.community.event.CommentEventDispatcher;
-import com.jivesoftware.community.event.MessageEventDispatcher;
-import com.jivesoftware.community.event.PollEventDispatcher;
-import com.jivesoftware.community.event.ThreadEventDispatcher;
-import com.jivesoftware.community.impl.ActivityListener;
 import com.jivesoftware.community.impl.dao.ActivityDAO;
 import com.jivesoftware.community.renderer.impl.v2.HtmlRenderUtils;
 import com.jivesoftware.community.renderer.impl.v2.JAXPUtils;
@@ -131,8 +118,6 @@
 
   private ActivityDAO activityDAO;
 
-  private ActivityListener activityListener;
-
   private AnnouncementManager announcementManager;
 
   private PollManager pollManager;
@@ -195,344 +180,8 @@
   }
 
   public Map<String, Long> migrateForums2Clearspace() {
-    final long start = System.currentTimeMillis();
-    log.error("INFO: Migration of forums to clearspace started");
-
-    log.error("INFO: Clearing all caches to have "
-        + "as much as possible free memory.");
-    CacheFactory.clearCaches();
-
-    Map<String, Long> result = new HashMap<String, Long>();
-
-    Map<Long, Long> forumMapping = getForumMappings();
-    long topicsCount = 0;
-    long postsCount = 0;
-    int newUsersCount = 0;
-    int failedTopics = 0;
-
-    log.trace("Unregistering activity listeners. "
-        + "Activities are handled by hand.");
-    ThreadEventDispatcher.getInstance().removeListener(activityListener);
-    MessageEventDispatcher.getInstance().removeListener(activityListener);
-    PollEventDispatcher.getInstance().removeListener(activityListener);
-    CommentEventDispatcher.getInstance().removeListener(activityListener);
-
-    int forumIndex = 0;
-    for (Long forumID : forumMapping.keySet()) {
-      forumIndex++;
-      log.error("INFO: Migrate topics for forum with ID: " + forumID + ", ("
-          + forumIndex + "/" + forumMapping.size() + ")");
-      log.error("INFO: Actual state of migration. Migrated posts: "
-          + postsCount + ". New users: " + newUsersCount + ". Failed topics: "
-          + failedTopics);
-      Collection<ActivityBean> activitiesFromMigration = new LinkedBlockingQueue<ActivityBean>();
-      Long communityID = forumMapping.get(forumID);
-
-      Community community;
-      try {
-        community = communityManager.getCommunity(communityID);
-      } catch (CommunityNotFoundException e) {
-        throw new RuntimeException(e);
-      }
-
-      List<NukesForumsTopicBean> topics = nukesForumsDAO
-          .getAllTopicsByForumID(forumID);
-
-      for (NukesForumsTopicBean topic : topics) {
-        // log.debug("Migrate posts for topic with ID: " +
-        // topic.getTopicID());
-
-        // log.trace("get First post for postID: " + topic.getFirstPostID());
-        try {
-          NukesForumsPostBean topicPost;
-          try {
-            topicPost = nukesForumsDAO.getPostByID(topic.getFirstPostID());
-          } catch (EmptyResultDataAccessException e) {
-            List<NukesForumsPostBean> replies = nukesForumsDAO
-                .getAllPostsByTopicID(topic.getTopicID(), null);
-            if (replies.isEmpty()) {
-              log
-                  .error("Topic has no firstPostID and also no replies, "
-                      + "topic_id: " + topic.getTopicID()
-                      + ". Going to next topic");
-              failedTopics++;
-              continue;
-            }
-            topicPost = replies.get(0);
-          }
-
-          // check topicPost time
-          // some posts has null value but topic time is set
-          Date now = new Date();
-          if (topicPost.getTime() == null || topicPost.getTime().after(now)) {
-            if (topic.getTime() != null && topic.getTime().before(now)) {
-              topicPost.setTime(topic.getTime());
-            } else {
-              // try to retrieve thread time from replies
-              List<NukesForumsPostBean> replies = nukesForumsDAO
-                  .getAllPostsByTopicID(topic.getTopicID(), topicPost
-                      .getPostID());
-              Date topicTime = null;
-              for (NukesForumsPostBean replyPost : replies) {
-                if (replyPost.getTime() != null
-                    && replyPost.getTime().before(now)) {
-                  topicTime = replyPost.getTime();
-                  break;
-                }
-              }
-              if (topicTime == null) {
-                // should not occur, but if yes then set default time
-                log.error("Topic has invalid creation date "
-                    + "(is null or is set to the future). "
-                    + "No reply founded with correct date. "
-                    + "Setting to default time: " + defaultTopicTime
-                    + ". topic_id: " + topic.getTopicID());
-                topicTime = defaultTopicTime;
-              }
-              topicPost.setTime(topicTime);
-              replies = null;
-            }
-          }
-
-          User rootMessageUser = findUser(topicPost.getPosterUsername(),
-              topicPost.getPosterEmail());
-
-          if (rootMessageUser == null) {
-            log.error("Unknkown user for topic_id: " + topic.getTopicID()
-                + " username: '" + topicPost.getPosterUsername()
-                + "'. Going to create new CS user");
-            try {
-              rootMessageUser = nukesUserManager.createUserFromNukes(topicPost
-                  .getPosterUsername());
-            } catch (UserAlreadyExistsException e) {
-              throw new RuntimeException(
-                  "User already exists, but we're sure that doesn't", e);
-            }
-            newUsersCount++;
-          }
-
-          if (topic.isAnnouncement()) {
-            try {
-              boolean success = createAnnouncement(topic, topicPost,
-                  rootMessageUser, community);
-              if (!success) {
-                log.error("Cannot create an Announcement, topic_id: "
-                    + topic.getTopicID());
-                failedTopics++;
-              }
-            } catch (UnauthorizedException e) {
-              throw new RuntimeException(
-                  "Cannot create an Announcement, topic_id: "
-                      + topic.getTopicID(), e);
-            } catch (RejectedException e) {
-              throw new RuntimeException(
-                  "Cannot create an Announcement, topic_id: "
-                      + topic.getTopicID(), e);
-            }
-            continue;
-          }
-
-          ForumThread thread = null;
-          Poll poll = null;
-          if (!topic.isContainsPoll()) {
-            try {
-              thread = createForumThread(community, rootMessageUser, topic,
-                  topicPost);
-              // add activity
-              ActivityBean activity = createActivity(thread, thread
-                  .getJiveContainer(), thread.getUser(), Activity.Type.created,
-                  thread.getCreationDate());
-
-              activitiesFromMigration.add(activity);
-
-              postsCount++;
-            } catch (Exception e) {
-              log
-                  .error("Cannot create forum thread. Going to next topic, topic_id: "
-                      + topic.getTopicID());
-              failedTopics++;
-              continue;
-            }
-
-          } else {
-            log.trace("Migrate poll");
-            NukesPollBean nukesPoll;
-            try {
-              nukesPoll = nukesForumsDAO.loadPoll(topic.getTopicID());
-            } catch (Exception e) {
-              log.error("Topic is signed as poll but poll doesn't exist."
-                  + "Going to next topic. topic_id: " + topic.getTopicID());
-              failedTopics++;
-              continue;
-            }
-            poll = createPoll(nukesPoll, topicPost, rootMessageUser, community);
-
-            // add activity
-            ActivityBean activity = createActivity(poll, community, poll
-                .getUser(), Activity.Type.created, poll.getStartDate());
-
-            activitiesFromMigration.add(activity);
-
-            if (topic.isContainsPoll()) {
-              log.trace("Add vote activities");
-
-              List<String[]> voters = nukesForumsDAO.getVoters(nukesPoll
-                  .getPollID());
-              for (String[] userDetail : voters) {
-                User user = findUser(userDetail[0], userDetail[1]);
-                if (user == null) {
-                  log.error("Unknkown user for poll vote, poll_id: "
-                      + nukesPoll.getPollID() + " username: '" + userDetail[0]
-                      + "'. Going to create new CS user");
-                  try {
-                    user = nukesUserManager.createUserFromNukes(userDetail[0]);
-                  } catch (UserAlreadyExistsException e) {
-                    throw new RuntimeException(
-                        "User already exists, but we're sure that doesn't", e);
-                  }
-                }
-
-                activity = createActivity(poll, community, user,
-                    Activity.Type.voted, poll.getStartDate());
-
-                activitiesFromMigration.add(activity);
-              }
-            }
-          }
-
-          log.trace("Migrate replies");
-          List<NukesForumsPostBean> replies = nukesForumsDAO
-              .getAllPostsByTopicID(topic.getTopicID(), topicPost.getPostID());
-          for (NukesForumsPostBean reply : replies) {
-            User replyUser = findUser(reply.getPosterUsername(), reply
-                .getPosterEmail());
-            if (replyUser == null) {
-              log.error("Unknkown user for reply_id: " + reply.getPostID()
-                  + " username: '" + reply.getPosterUsername()
-                  + "'. Going to create new CS user");
-              try {
-                replyUser = nukesUserManager.createUserFromNukes(reply
-                    .getPosterUsername());
-              } catch (UserAlreadyExistsException e) {
-                throw new RuntimeException(
-                    "User already exists, but we're sure that doesn't", e);
-              }
-              newUsersCount++;
-            }
-
-            org.w3c.dom.Document replyBody;
-            try {
-              replyBody = createDocument(reply.getBody());
-            } catch (Exception e) {
-              log.error("Cannot parse reply body for thread reply. "
-                  + "Going to next reply. post_id: " + reply.getPostID());
-              log.error("Post body: " + reply.getBody());
-              failedTopics++;
-              continue;
-            }
-            Date replyDate = reply.getTime();
-            if (replyDate == null || replyDate.after(now)) {
-              replyDate = new Date(topicPost.getTime().getTime() + 1);
-              log.error("Correcting reply date. Original date: "
-                  + reply.getTime() + ". New date: " + replyDate
-                  + ". Reply post_id: " + reply.getPostID());
-            }
-
-            if (!topic.isContainsPoll()) {
-              ForumMessage replyMessage = forumManager.createMessage(community,
-                  replyUser);
-              replyMessage.setBody(replyBody);
-              replyMessage.setCreationDate(replyDate);
-              replyMessage.setModificationDate(replyDate);
-              replyMessage.setSubject(reply.getSubject());
-
-              try {
-                forumManager.addMessage(thread, thread.getRootMessage(),
-                    replyMessage);
-
-                nukesForumsMappingDAO.savePostMapping(reply.getPostID(),
-                    replyMessage.getID());
-
-                // add activity
-                ActivityBean activity = createActivity(replyMessage
-                    .getForumThread(), replyMessage.getJiveContainer(),
-                    replyMessage.getUser(), Activity.Type.replied, replyMessage
-                        .getCreationDate());
-
-                activitiesFromMigration.add(activity);
-
-              } catch (RejectedException e) {
-                throw new RuntimeException(e);
-              }
-            } else {
-              CommentDelegator commentDelegator = poll.getCommentDelegator();
-              try {
-                Comment comment = commentDelegator.createComment(replyUser,
-                    replyBody);
-                comment.setCreationDate(replyDate);
-                comment.setModificationDate(replyDate);
-
-                commentDelegator.addComment(comment);
-
-                nukesForumsMappingDAO.savePostMapping(reply.getPostID(), (poll
-                    .getID() * -1));
-
-                // add activity
-                ActivityBean activity = createActivity(poll, community, comment
-                    .getUser(), Activity.Type.commented, comment
-                    .getCreationDate());
-
-                activitiesFromMigration.add(activity);
-              } catch (RejectedException e) {
-                throw new RuntimeException("Cannot create poll comment", e);
-              }
-            }
-            postsCount++;
-          }
-
-          if (!topic.isContainsPoll() && topic.getViewCount() > 0) {
-            viewCountManager.clearCount(thread);
-            viewCountDAO.insertViewCount(JiveConstants.THREAD, thread.getID(),
-                community.getID(), topic.getViewCount());
-          }
-          migrateTopicWatches(topic.getTopicID(), thread);
-          topicsCount++;
-        } catch (Exception e) {
-          log.error("Some unexpected error occur. "
-              + "Going to next topic. forum_id" + forumID, e);
-          failedTopics++;
-        }
-      }
-
-      migrateForumWatches(forumID, community);
-
-      log.trace("Insert activities into DB");
-      activityDAO.create(activitiesFromMigration);
-    }
-
-    result.put("topicsCount", topicsCount);
-    result.put("postsCount", postsCount);
-    result.put("newUsersCount", new Long(newUsersCount));
-
-    log.error("INFO: Clearing all caches.");
-    CacheFactory.clearCaches();
-
-    log.trace("Registering back activity listener to event dispatchers.");
-    ThreadEventDispatcher.getInstance().addListener(activityListener);
-    MessageEventDispatcher.getInstance().addListener(activityListener);
-    PollEventDispatcher.getInstance().addListener(activityListener);
-    CommentEventDispatcher.getInstance().addListener(activityListener);
-
-    final long timeConsumed = (System.currentTimeMillis() - start) / 1000;
-    log.error("INFO: Migration completed, time taken: " + (long) timeConsumed
-        / 60 + " minutes.");
-    log.error("INFO: Count of topics migrated: " + topicsCount);
-    log.error("INFO: Count of posts migrated:  " + postsCount);
-    log.error("INFO: Count of failed posts due to their inconsistency:  "
-        + failedTopics);
-    log.error("INFO: New users created: " + newUsersCount);
-
-    return result;
+    // implementation deleted - to be compatible with SBS 4.x
+    throw new RuntimeException("Not implemented.");
   }
 
   /**
@@ -1198,10 +847,6 @@
     this.nukesUserManager = nukesUserManager;
   }
 
-  public void setActivityListener(ActivityListener activityListener) {
-    this.activityListener = activityListener;
-  }
-
   public void setActivityDAO(ActivityDAO activityDAO) {
     this.activityDAO = activityDAO;
   }

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesUserManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesUserManager.java	2010-02-11 16:13:01 UTC (rev 31568)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesUserManager.java	2010-02-11 16:17:19 UTC (rev 31569)
@@ -32,6 +32,7 @@
 import org.jboss.labs.clearspace.plugin.nfm.dao.NukesForumsDAO;
 import org.jboss.labs.clearspace.plugin.nfm.dao.NukesUserBean;
 
+import com.jivesoftware.base.EmailAlreadyExistsException;
 import com.jivesoftware.base.User;
 import com.jivesoftware.base.UserAlreadyExistsException;
 import com.jivesoftware.base.UserManager;
@@ -61,7 +62,7 @@
   private ProfileFieldManager profileFieldManager;
 
   public User createUserFromNukes(String username)
-      throws UserAlreadyExistsException {
+      throws UserAlreadyExistsException, EmailAlreadyExistsException {
     NukesUserBean nukeUser = nukesForumsDAO.getNukesUser(username);
 
     // Implementation taken from UserImporter service in cs-nukes-login module

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/NukesUserManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/NukesUserManager.java	2010-02-11 16:13:01 UTC (rev 31568)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/NukesUserManager.java	2010-02-11 16:17:19 UTC (rev 31569)
@@ -21,6 +21,7 @@
  */
 package org.jboss.labs.clearspace.plugin.nfm;
 
+import com.jivesoftware.base.EmailAlreadyExistsException;
 import com.jivesoftware.base.User;
 import com.jivesoftware.base.UserAlreadyExistsException;
 
@@ -37,8 +38,9 @@
    * @param username
    * @return CS user
    * @throws UserAlreadyExistsException
+   * @throws EmailAlreadyExistsException 
    */
   public User createUserFromNukes(String username)
-      throws UserAlreadyExistsException;
+      throws UserAlreadyExistsException, EmailAlreadyExistsException;
 
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesUserBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesUserBean.java	2010-02-11 16:13:01 UTC (rev 31568)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesUserBean.java	2010-02-11 16:17:19 UTC (rev 31569)
@@ -455,4 +455,28 @@
 	public boolean isAnonymous() {
 		return false;
 	}
+
+  @Override
+  public Date getLastProfileUpdate() {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
+  @Override
+  public boolean isEmailViewable() {
+    // TODO Auto-generated method stub
+    return false;
+  }
+
+  @Override
+  public boolean isNameViewable() {
+    // TODO Auto-generated method stub
+    return true;
+  }
+
+  @Override
+  public boolean isVisible() {
+    // TODO Auto-generated method stub
+    return true;
+  }
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/struts/RedirectNFToCSForumAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/struts/RedirectNFToCSForumAction.java	2010-02-11 16:13:01 UTC (rev 31568)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/struts/RedirectNFToCSForumAction.java	2010-02-11 16:17:19 UTC (rev 31569)
@@ -39,7 +39,7 @@
   /**
    * URL to redirect
    */
-  private String url = null;
+  private String urlToRedirect = null;
 
   private String module = null;
 
@@ -59,21 +59,21 @@
 
   @Override
   public String execute() {
-    url = nukesForumsManager.getCSForumsURL(module, op, c, f, t, p);
+    urlToRedirect = nukesForumsManager.getCSForumsURL(module, op, c, f, t, p);
 
-    if (url == null) {
+    if (urlToRedirect == null) {
       return NOTFOUND;
     }
 
     return SUCCESS;
   }
 
-  public String getUrl() {
-    return url;
+  public String getUrlToRedirect() {
+    return urlToRedirect;
   }
 
-  public void setUrl(String url) {
-    this.url = url;
+  public void setUrlToRedirect(String urlToRedirect) {
+    this.urlToRedirect = urlToRedirect;
   }
 
   public String getModule() {

Copied: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/cache-config.xml (from rev 31544, labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/cache-config.xml)
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/cache-config.xml	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/cache-config.xml	2010-02-11 16:17:19 UTC (rev 31569)
@@ -0,0 +1,39 @@
+<cache-config>
+  <cache-mapping>
+    <cache-name>Nukes Forums Topic mapping</cache-name>
+    <scheme-name>default-near</scheme-name>
+    <init-params>
+      <init-param>
+        <param-name>back-size-high</param-name>
+        <param-value>131072</param-value>
+      </init-param>
+      <init-param>
+        <param-name>back-expiry</param-name>
+        <param-value>6h</param-value>
+      </init-param>
+      <init-param>
+        <param-name>back-size-low</param-name>
+        <param-value>117965</param-value>
+      </init-param>
+    </init-params>
+  </cache-mapping>
+  <cache-mapping>
+    <cache-name>Nukes Forums Post mapping</cache-name>
+    <scheme-name>default-near</scheme-name>
+    <init-params>
+      <init-param>
+        <param-name>back-size-high</param-name>
+        <param-value>131072</param-value>
+      </init-param>
+      <init-param>
+        <param-name>back-expiry</param-name>
+        <param-value>6h</param-value>
+      </init-param>
+      <init-param>
+        <param-name>back-size-low</param-name>
+        <param-value>117965</param-value>
+      </init-param>
+    </init-params>
+  </cache-mapping>
+
+</cache-config>


Property changes on: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/cache-config.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/plugin.xml (from rev 31544, labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/plugin.xml)
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/plugin.xml	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/plugin.xml	2010-02-11 16:17:19 UTC (rev 31569)
@@ -0,0 +1,29 @@
+<plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="http://www.jivesoftware.com/schemas/clearspace/2_0/plugin.xsd">
+  <name>nukes-forums-migration</name>
+  <description>Migration tool for movement Nukes Forums to Clearspace discussions</description>
+  <author>JBoss Community</author>
+  <version>2.0.0</version>
+  <minServerVersion>4.0.0</minServerVersion>
+
+  <!-- Plugin class 
+  <class>org.jboss.labs.clearspace.plugin.hfurl.HFURLPlugin</class>
+  -->
+
+  <databaseKey>nukesForumsMigration</databaseKey>
+  <databaseVersion>1</databaseVersion>
+
+  <components>
+    <component id="admin-console">
+      <tab id="system">
+        <section id="section-system">
+          <item id="system-nfm"
+                      name="plugin.nfm.admin.nfm.name"
+                      url="nukes-forums-migration-view.jspa"
+                      description="plugin.nfm.admin.nfm.description"/>
+        </section>
+      </tab>
+    </component>
+  </components>
+
+</plugin>


Property changes on: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/plugin.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/resources/templates/admin (from rev 31544, labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/web/admin)

Copied: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/schema.xml (from rev 31544, labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/schema.xml)
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/schema.xml	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/schema.xml	2010-02-11 16:17:19 UTC (rev 31569)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema name="nukesForums">
+
+  <table name="nukesForumsCategoryMapping"
+    description="Mapping of Nukes Forums category IDs to Clearspace community IDs">
+    <column name="cat_id" type="bigint" nullable="false"
+      description="Primary key - Category ID" />
+    <column name="communityID" type="bigint" nullable="false"
+      description="Community ID" />
+    <index type="primary" name="nfCategoryMapping_pk" column="cat_id" />
+  </table>
+
+  <table name="nukesForumsForumMapping"
+    description="Mapping of Nukes Forums forum IDs to Clearspace community IDs">
+    <column name="forum_id" type="bigint" nullable="false"
+      description="Primary key - Forum ID" />
+    <column name="communityID" type="bigint" nullable="false"
+      description="Community ID" />
+    <index type="primary" name="nfForumMapping_pk" column="forum_id" />
+  </table>
+
+  <table name="nukesForumsTopicMapping"
+    description="Mapping of Nukes Forums topic IDs to Clearspace thread IDs">
+    <column name="topic_id" type="bigint" nullable="false"
+      description="Primary key - Topic ID" />
+    <column name="threadID" type="bigint" nullable="false"
+      description="Thread ID" />
+    <index type="primary" name="nfTopicMapping_pk" column="topic_id" />
+  </table>
+
+  <table name="nukesForumsPostMapping"
+    description="Mapping of Nukes Forums post IDs to Clearspace message IDs">
+    <column name="post_id" type="bigint" nullable="false"
+      description="Primary key - Post ID" />
+    <column name="messageID" type="bigint" nullable="false"
+      description="Message ID" />
+    <index type="primary" name="nfPostMapping_pk" column="post_id" />
+  </table>
+
+</schema>


Property changes on: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/schema.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/spring.xml (from rev 31544, labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/spring.xml)
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/spring.xml	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/spring.xml	2010-02-11 16:17:19 UTC (rev 31569)
@@ -0,0 +1,111 @@
+<?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="topicMappings" parent="cacheBean" depends-on="cacheFactoryManager">
+    <constructor-arg value="Nukes Forums Topic mapping" />
+  </bean>
+
+  <bean id="postMappings" parent="cacheBean" depends-on="cacheFactoryManager">
+    <constructor-arg value="Nukes Forums Post mapping" />
+  </bean>
+
+
+  <bean id="nukesForumsManager"
+    class="org.jboss.labs.clearspace.plugin.nfm.DbNukesForumsManager">
+    <property name="nukesForumsMappingDAO" ref="nukesForumsMappingDAO" />
+<!--    <property name="nukesForumsDAO" ref="nukesForumsDAO" /> -->
+    <property name="viewCountDAO" ref="viewCountDAO" />
+    <property name="communityManager" ref="communityManager" />
+    <property name="forumManager" ref="forumManager" />
+    <property name="userManager" ref="userManager" />
+    <property name="viewCountManager" ref="viewCountManager" />
+    <property name="questionManager" ref="questionManager" />
+    <property name="watchManager" ref="watchManager" />
+    <property name="announcementManager" ref="announcementManager" />
+    <property name="tagManager" ref="tagManager" />
+    <property name="pollManager" ref="pollManager" />
+    <!-- JBoss.org Clearspace lives as root application in community.jboss.org -->
+    <property name="appContext" value="" />    
+    <property name="defaultTopicTimeStr" value="2002-01-01" />
+    <property name="stripOutSuffix" value=" Users" />
+
+    <property name="topicMappings" ref="topicMappings" />
+    <property name="postMappings" ref="postMappings" />
+
+    <property name="nukesUserManager" ref="nukesUserManager" />
+    
+    <property name="activityDAO" ref="activityDAO" />
+
+    <property name="converters">
+      <list>
+        <ref local="bbCodeConverter" />
+      </list>
+    </property>
+  </bean>
+
+  <bean id="nukesUserManager"
+    class="org.jboss.labs.clearspace.plugin.nfm.DbNukesUserManager">
+    <property name="userManager" ref="userManagerImpl" />
+    <property name="profileManager" ref="profileManagerImpl" />
+    <property name="profileFieldManager" ref="profileFieldManagerImpl" />
+<!--   <property name="nukesForumsDAO" ref="nukesForumsDAO" /> -->
+  </bean>
+
+
+  <!--
+    Lazy init is due we not sure that admin put porta-format-lib.jar to
+    classpath
+  -->
+  <bean id="bbCodeConverter"
+    class="org.jboss.labs.clearspace.plugin.nfm.converter.BBCodeConverter">
+    <property name="codeParser" ref="bbCodeParser" />
+  </bean>
+
+  <bean id="bbCodeParser" class="org.jboss.portal.format.parser.bbcode.BBCodeParser"
+    lazy-init="true">
+    <property name="handler" ref="bbCode2CSHTMLParseEventHandler" />
+  </bean>
+
+  <bean id="bbCode2CSHTMLParseEventHandler"
+    class="org.jboss.labs.clearspace.plugin.nfm.converter.BBCode2CSHTMLParseEventHandler">
+    <property name="renderer" ref="bbCodeConverter" />
+  </bean>
+
+  <bean id="nukesForumsMappingDAO"
+    class="org.jboss.labs.clearspace.plugin.nfm.dao.DbNukesForumsMappingDAOImpl">
+    <property name="dataSource">
+      <util:property-path path="dataSourceFactory.dataSource" />
+    </property>
+  </bean>
+
+  <bean id="viewCountDAO"
+    class="org.jboss.labs.clearspace.plugin.nfm.dao.DbViewCountDAO">
+    <property name="dataSource">
+      <util:property-path path="dataSourceFactory.dataSource" />
+    </property>
+  </bean>
+
+  <!-- it's not used anymore.   
+  <bean id="nukesForumsDAO"
+    class="org.jboss.labs.clearspace.plugin.nfm.dao.DbNukesForumsDAOImpl">
+    <property name="dataSource" value="null"/>
+  </bean>
+  -->
+
+  <!-- 
+  Put these definition to jiveHome/etc/spring.xml or uncomment it and deploy a plugin
+  <bean id="nukesForumsDataSource"
+    class="org.springframework.jdbc.datasource.SingleConnectionDataSource">
+    <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+    <property name="url" value="jdbc:mysql://localhost:3306/nukesprod" />
+    <property name="username" value="nukesprod" />
+    <property name="password" value="" />
+  </bean>
+   -->
+
+</beans>


Property changes on: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/spring.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/struts.xml (from rev 31544, labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/struts.xml)
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/struts.xml	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/struts.xml	2010-02-11 16:17:19 UTC (rev 31569)
@@ -0,0 +1,84 @@
+<!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+        "http://struts.apache.org/dtds/struts-2.0.dtd">
+<struts>
+  <package name="nfm-actions-admin" namespace="/admin"
+    extends="community-admin-default">
+
+    <action name="nukes-forums-migration-view"
+      class="org.jboss.labs.clearspace.plugin.nfm.struts.AdminNfmAction"
+      method="input">
+      <result name="input" type="freemarker">
+        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
+      </result>
+    </action>
+    
+    <action name="nukes-forums-refresh-category-mapping"
+      class="org.jboss.labs.clearspace.plugin.nfm.struts.AdminNfmAction"
+      method="refreshCategoryMapping">
+      <result name="input" type="freemarker">
+        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
+      </result>
+      <result name="success" type="freemarker">
+        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
+      </result>
+    </action>
+
+    <action name="nukes-forums-refresh-forum-mapping"
+      class="org.jboss.labs.clearspace.plugin.nfm.struts.AdminNfmAction"
+      method="refreshForumMapping">
+      <result name="input" type="freemarker">
+        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
+      </result>
+      <result name="success" type="freemarker">
+        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
+      </result>
+    </action>
+    
+    <action name="nukes-forums-create-communities-layout"
+      class="org.jboss.labs.clearspace.plugin.nfm.struts.AdminNfmAction"
+      method="createInitialCommunitiesLayout">
+      <result name="input" type="freemarker">
+        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
+      </result>
+      <result name="success" type="freemarker">
+        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
+      </result>
+    </action>
+    
+    <action name="nukes-forums-create-forums-mapping"
+      class="org.jboss.labs.clearspace.plugin.nfm.struts.AdminNfmAction"
+      method="createForumMapping">
+      <result name="input" type="freemarker">
+        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
+      </result>
+      <result name="success" type="freemarker">
+        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
+      </result>
+    </action>
+
+    <action name="nukes-forums-migrate"
+      class="org.jboss.labs.clearspace.plugin.nfm.struts.AdminNfmAction"
+      method="migrateForums2Clearspace">
+      <result name="input" type="freemarker">
+        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
+      </result>
+      <result name="success" type="freemarker">
+        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
+      </result>
+    </action>
+  </package>
+  
+  <package name="nfm-actions" namespace="/nfm" extends="community-actions">
+    <action name="redirectToCSForum"
+      class="org.jboss.labs.clearspace.plugin.nfm.struts.RedirectNFToCSForumAction">
+      <result name="success" type="httpheader">
+        <param name="status">301</param>
+        <param name="headers.Location">${urlToRedirect}</param>
+        <param name="parse">true</param>
+      </result>
+      <result name="input" type="redirect">/</result>
+      <result name="urlNotDefined" type="redirect">/</result>
+    </action>
+  </package>
+
+</struts>


Property changes on: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/plugin/struts.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/cache-config.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/cache-config.xml	2010-02-11 16:13:01 UTC (rev 31568)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/cache-config.xml	2010-02-11 16:17:19 UTC (rev 31569)
@@ -1,39 +0,0 @@
-<cache-config>
-  <cache-mapping>
-    <cache-name>Nukes Forums Topic mapping</cache-name>
-    <scheme-name>default-near</scheme-name>
-    <init-params>
-      <init-param>
-        <param-name>back-size-high</param-name>
-        <param-value>131072</param-value>
-      </init-param>
-      <init-param>
-        <param-name>back-expiry</param-name>
-        <param-value>6h</param-value>
-      </init-param>
-      <init-param>
-        <param-name>back-size-low</param-name>
-        <param-value>117965</param-value>
-      </init-param>
-    </init-params>
-  </cache-mapping>
-  <cache-mapping>
-    <cache-name>Nukes Forums Post mapping</cache-name>
-    <scheme-name>default-near</scheme-name>
-    <init-params>
-      <init-param>
-        <param-name>back-size-high</param-name>
-        <param-value>131072</param-value>
-      </init-param>
-      <init-param>
-        <param-name>back-expiry</param-name>
-        <param-value>6h</param-value>
-      </init-param>
-      <init-param>
-        <param-name>back-size-low</param-name>
-        <param-value>117965</param-value>
-      </init-param>
-    </init-params>
-  </cache-mapping>
-
-</cache-config>

Deleted: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/plugin.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/plugin.xml	2010-02-11 16:13:01 UTC (rev 31568)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/plugin.xml	2010-02-11 16:17:19 UTC (rev 31569)
@@ -1,29 +0,0 @@
-<plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="http://www.jivesoftware.com/schemas/clearspace/2_0/plugin.xsd">
-  <name>nukes-forums-migration</name>
-  <description>Migration tool for movement Nukes Forums to Clearspace discussions</description>
-  <author>JBoss.org</author>
-  <version>1.0.0</version>
-  <minServerVersion>2.5.0</minServerVersion>
-
-  <!-- Plugin class 
-  <class>org.jboss.labs.clearspace.plugin.hfurl.HFURLPlugin</class>
-  -->
-
-  <databaseKey>nukesForumsMigration</databaseKey>
-  <databaseVersion>1</databaseVersion>
-
-  <components>
-    <component id="admin-console">
-      <tab id="system">
-        <section id="section-system">
-          <item id="system-nfm"
-                      name="plugin.nfm.admin.nfm.name"
-                      url="nukes-forums-migration-view.jspa"
-                      description="plugin.nfm.admin.nfm.description"/>
-        </section>
-      </tab>
-    </component>
-  </components>
-
-</plugin>

Deleted: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/schema.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/schema.xml	2010-02-11 16:13:01 UTC (rev 31568)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/schema.xml	2010-02-11 16:17:19 UTC (rev 31569)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema name="nukesForums">
-
-  <table name="nukesForumsCategoryMapping"
-    description="Mapping of Nukes Forums category IDs to Clearspace community IDs">
-    <column name="cat_id" type="bigint" nullable="false"
-      description="Primary key - Category ID" />
-    <column name="communityID" type="bigint" nullable="false"
-      description="Community ID" />
-    <index type="primary" name="nfCategoryMapping_pk" column="cat_id" />
-  </table>
-
-  <table name="nukesForumsForumMapping"
-    description="Mapping of Nukes Forums forum IDs to Clearspace community IDs">
-    <column name="forum_id" type="bigint" nullable="false"
-      description="Primary key - Forum ID" />
-    <column name="communityID" type="bigint" nullable="false"
-      description="Community ID" />
-    <index type="primary" name="nfForumMapping_pk" column="forum_id" />
-  </table>
-
-  <table name="nukesForumsTopicMapping"
-    description="Mapping of Nukes Forums topic IDs to Clearspace thread IDs">
-    <column name="topic_id" type="bigint" nullable="false"
-      description="Primary key - Topic ID" />
-    <column name="threadID" type="bigint" nullable="false"
-      description="Thread ID" />
-    <index type="primary" name="nfTopicMapping_pk" column="topic_id" />
-  </table>
-
-  <table name="nukesForumsPostMapping"
-    description="Mapping of Nukes Forums post IDs to Clearspace message IDs">
-    <column name="post_id" type="bigint" nullable="false"
-      description="Primary key - Post ID" />
-    <column name="messageID" type="bigint" nullable="false"
-      description="Message ID" />
-    <index type="primary" name="nfPostMapping_pk" column="post_id" />
-  </table>
-
-</schema>

Deleted: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/spring.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/spring.xml	2010-02-11 16:13:01 UTC (rev 31568)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/spring.xml	2010-02-11 16:17:19 UTC (rev 31569)
@@ -1,110 +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="topicMappings" parent="cacheBean" depends-on="cacheFactoryManager">
-    <constructor-arg value="Nukes Forums Topic mapping" />
-  </bean>
-
-  <bean id="postMappings" parent="cacheBean" depends-on="cacheFactoryManager">
-    <constructor-arg value="Nukes Forums Post mapping" />
-  </bean>
-
-
-  <bean id="nukesForumsManager"
-    class="org.jboss.labs.clearspace.plugin.nfm.DbNukesForumsManager">
-    <property name="nukesForumsMappingDAO" ref="nukesForumsMappingDAO" />
-    <property name="nukesForumsDAO" ref="nukesForumsDAO" />
-    <property name="viewCountDAO" ref="viewCountDAO" />
-    <property name="communityManager" ref="communityManager" />
-    <property name="forumManager" ref="forumManager" />
-    <property name="userManager" ref="userManager" />
-    <property name="viewCountManager" ref="viewCountManager" />
-    <property name="questionManager" ref="questionManager" />
-    <property name="watchManager" ref="watchManager" />
-    <property name="announcementManager" ref="announcementManager" />
-    <property name="tagManager" ref="tagManager" />
-    <property name="pollManager" ref="pollManager" />
-    <!-- JBoss.org Clearspace lives as root application in community.jboss.org -->
-    <property name="appContext" value="" />    
-    <property name="defaultTopicTimeStr" value="2002-01-01" />
-    <property name="stripOutSuffix" value=" Users" />
-
-    <property name="topicMappings" ref="topicMappings" />
-    <property name="postMappings" ref="postMappings" />
-
-    <property name="nukesUserManager" ref="nukesUserManager" />
-    
-    <property name="activityDAO" ref="activityDAO" />
-    <property name="activityListener" ref="activityListener" />
-
-    <property name="converters">
-      <list>
-        <ref local="bbCodeConverter" />
-      </list>
-    </property>
-  </bean>
-
-  <bean id="nukesUserManager"
-    class="org.jboss.labs.clearspace.plugin.nfm.DbNukesUserManager">
-    <property name="userManager" ref="userManagerImpl" />
-    <property name="profileManager" ref="profileManagerImpl" />
-    <property name="profileFieldManager" ref="profileFieldManagerImpl" />
-    <property name="nukesForumsDAO" ref="nukesForumsDAO" />
-  </bean>
-
-
-  <!--
-    Lazy init is due we not sure that admin put porta-format-lib.jar to
-    classpath
-  -->
-  <bean id="bbCodeConverter"
-    class="org.jboss.labs.clearspace.plugin.nfm.converter.BBCodeConverter">
-    <property name="codeParser" ref="bbCodeParser" />
-  </bean>
-
-  <bean id="bbCodeParser" class="org.jboss.portal.format.parser.bbcode.BBCodeParser"
-    lazy-init="true">
-    <property name="handler" ref="bbCode2CSHTMLParseEventHandler" />
-  </bean>
-
-  <bean id="bbCode2CSHTMLParseEventHandler"
-    class="org.jboss.labs.clearspace.plugin.nfm.converter.BBCode2CSHTMLParseEventHandler">
-    <property name="renderer" ref="bbCodeConverter" />
-  </bean>
-
-  <bean id="nukesForumsMappingDAO"
-    class="org.jboss.labs.clearspace.plugin.nfm.dao.DbNukesForumsMappingDAOImpl">
-    <property name="dataSource">
-      <util:property-path path="dataSourceFactory.dataSource" />
-    </property>
-  </bean>
-
-  <bean id="viewCountDAO"
-    class="org.jboss.labs.clearspace.plugin.nfm.dao.DbViewCountDAO">
-    <property name="dataSource">
-      <util:property-path path="dataSourceFactory.dataSource" />
-    </property>
-  </bean>
-
-  <bean id="nukesForumsDAO"
-    class="org.jboss.labs.clearspace.plugin.nfm.dao.DbNukesForumsDAOImpl">
-    <property name="dataSource" ref="nukesForumsDataSource" />
-  </bean>
-
-  <!-- 
-  Put these definition to jiveHome/etc/spring.xml or uncomment it and deploy a plugin
-  <bean id="nukesForumsDataSource"
-    class="org.springframework.jdbc.datasource.SingleConnectionDataSource">
-    <property name="driverClassName" value="com.mysql.jdbc.Driver" />
-    <property name="url" value="jdbc:mysql://localhost:3306/nukesprod" />
-    <property name="username" value="nukesprod" />
-    <property name="password" value="" />
-  </bean>
-   -->
-
-</beans>

Deleted: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/struts.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/struts.xml	2010-02-11 16:13:01 UTC (rev 31568)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/struts.xml	2010-02-11 16:17:19 UTC (rev 31569)
@@ -1,84 +0,0 @@
-<!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-        "http://struts.apache.org/dtds/struts-2.0.dtd">
-<struts>
-  <package name="nfm-actions-admin" namespace="/admin"
-    extends="community-admin-default">
-
-    <action name="nukes-forums-migration-view"
-      class="org.jboss.labs.clearspace.plugin.nfm.struts.AdminNfmAction"
-      method="input">
-      <result name="input" type="freemarker">
-        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
-      </result>
-    </action>
-    
-    <action name="nukes-forums-refresh-category-mapping"
-      class="org.jboss.labs.clearspace.plugin.nfm.struts.AdminNfmAction"
-      method="refreshCategoryMapping">
-      <result name="input" type="freemarker">
-        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
-      </result>
-      <result name="success" type="freemarker">
-        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
-      </result>
-    </action>
-
-    <action name="nukes-forums-refresh-forum-mapping"
-      class="org.jboss.labs.clearspace.plugin.nfm.struts.AdminNfmAction"
-      method="refreshForumMapping">
-      <result name="input" type="freemarker">
-        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
-      </result>
-      <result name="success" type="freemarker">
-        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
-      </result>
-    </action>
-    
-    <action name="nukes-forums-create-communities-layout"
-      class="org.jboss.labs.clearspace.plugin.nfm.struts.AdminNfmAction"
-      method="createInitialCommunitiesLayout">
-      <result name="input" type="freemarker">
-        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
-      </result>
-      <result name="success" type="freemarker">
-        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
-      </result>
-    </action>
-    
-    <action name="nukes-forums-create-forums-mapping"
-      class="org.jboss.labs.clearspace.plugin.nfm.struts.AdminNfmAction"
-      method="createForumMapping">
-      <result name="input" type="freemarker">
-        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
-      </result>
-      <result name="success" type="freemarker">
-        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
-      </result>
-    </action>
-
-    <action name="nukes-forums-migrate"
-      class="org.jboss.labs.clearspace.plugin.nfm.struts.AdminNfmAction"
-      method="migrateForums2Clearspace">
-      <result name="input" type="freemarker">
-        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
-      </result>
-      <result name="success" type="freemarker">
-        /plugins/nukes-forums-migration/admin/nukes-forums-migration.ftl
-      </result>
-    </action>
-  </package>
-  
-  <package name="nfm-actions" namespace="/nfm" extends="community-actions">
-    <action name="redirectToCSForum"
-      class="org.jboss.labs.clearspace.plugin.nfm.struts.RedirectNFToCSForumAction">
-      <result name="success" type="httpheader">
-        <param name="status">301</param>
-        <param name="headers.Location">${url}</param>
-        <param name="parse">true</param>
-      </result>
-      <result name="input" type="redirect">/</result>
-      <result name="urlNotDefined" type="redirect">/</result>
-    </action>
-  </package>
-
-</struts>



More information about the jboss-svn-commits mailing list