Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r894 - in trunk/forge/portal-extensions: . binaries/maven-repo-addons/tmate/jars forge-common/src/java/org/jboss/forge/common/content forge-common/src/java/org/jboss/forge/common/portlet forge-forums forge-service/src/java/org/jboss/forge/service mysql-connector
|
From: <jbo...@li...> - 2005-08-18 16:51:31
|
Author: adamw
Date: 2005-08-18 12:44:30 -0400 (Thu, 18 Aug 2005)
New Revision: 894
Added:
trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn-cli.jar
trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn-javahl.jar
trunk/forge/portal-extensions/mysql-connector/mysql-connector-java-3.1.10-bin.jar
Removed:
trunk/forge/portal-extensions/mysql-connector/mysql-connector-java-3.1.8-bin.jar
Modified:
trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn.jar
trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/jsch.jar
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/portlet/ContentPortlet.java
trunk/forge/portal-extensions/forge-forums/maven.xml
trunk/forge/portal-extensions/forge-forums/project.xml
trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java
trunk/forge/portal-extensions/maven.xml
trunk/forge/portal-extensions/mysql-connector/maven.xml
Log:
New tmate svn lib
Added: trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn-cli.jar
===================================================================
(Binary files differ)
Property changes on: trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn-cli.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn-javahl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn-javahl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/jsch.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java 2005-08-18 15:43:12 UTC (rev 893)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java 2005-08-18 16:44:30 UTC (rev 894)
@@ -8,16 +8,15 @@
*****************************************/
package org.jboss.forge.common.content;
-import org.tmatesoft.svn.core.ISVNWorkspace;
-import org.tmatesoft.svn.core.SVNWorkspaceManager;
+import org.tmatesoft.svn.core.SVNException;
+import org.tmatesoft.svn.core.SVNURL;
import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory;
import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl;
-import org.tmatesoft.svn.core.internal.ws.fs.FSEntryFactory;
-import org.tmatesoft.svn.core.io.SVNException;
-import org.tmatesoft.svn.core.io.SVNRepository;
-import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
-import org.tmatesoft.svn.core.io.SVNRepositoryLocation;
-import org.tmatesoft.svn.core.io.SVNSimpleCredentialsProvider;
+import org.tmatesoft.svn.core.wc.ISVNOptions;
+import org.tmatesoft.svn.core.wc.SVNClientManager;
+import org.tmatesoft.svn.core.wc.SVNRevision;
+import org.tmatesoft.svn.core.wc.SVNUpdateClient;
+import org.tmatesoft.svn.core.wc.SVNWCUtil;
import java.io.File;
import java.io.IOException;
@@ -51,66 +50,58 @@
// for SVN (over svn and svn+ssh)
SVNRepositoryFactoryImpl.setup();
- // Working copy storage (default is file system).
- FSEntryFactory.setup();
-
this.svnPath = svnPath;
this.localPath = localPath;
this.svnUsername = svnUsername;
this.svnPassword = svnPassword;
}
- private ISVNWorkspace updateWorkingCopy() throws SVNException {
- SVNRepositoryLocation location = SVNRepositoryLocation
- .parseURL(svnPath);
- SVNRepository repository = SVNRepositoryFactory.create(location);
- repository.setCredentialsProvider(new SVNSimpleCredentialsProvider(
- svnUsername, svnPassword));
-
- File directory = new File(localPath);
- ISVNWorkspace workspace = SVNWorkspaceManager.createWorkspace("file",
- directory.getAbsolutePath());
- workspace.setCredentials(svnUsername, svnPassword);
-
- try {
- /*
- * Trying to read location of the repository - this is a way to
- * check if the content is already checked out and we may do an
- * update, or if we have to do a full checkout.
- */
- workspace.getLocation();
- workspace.update(repository.getLatestRevision());
- } catch (SVNException e) {
- workspace.checkout(location, ISVNWorkspace.HEAD, false);
- }
-
- return workspace;
- }
-
public synchronized void update() {
- try {
- updateWorkingCopy();
- } catch (SVNException e) {
- System.out.println(e.getMessage());
- }
+ ISVNOptions options = SVNWCUtil.createDefaultOptions(true);
+ SVNClientManager ourClientManager =
+ SVNClientManager.newInstance(options, svnUsername, svnPassword);
+
+ try {
+ SVNURL repositoryURL = SVNURL.parseURIEncoded(svnPath);
+
+ File wcPath = new File(localPath);
+
+ SVNUpdateClient updateClient = ourClientManager.getUpdateClient();
+ updateClient.setIgnoreExternals(false);
+ try {
+ /*
+ * Trying to do an update - if it does not succeed, then most
+ * probably the wc hasn't been checked out yet. That's why
+ * we try to do a check out in case of an error.
+ */
+ updateClient.doUpdate(wcPath, SVNRevision.HEAD,
+ true);
+ } catch (SVNException e) {
+ updateClient.doCheckout(repositoryURL, wcPath,
+ SVNRevision.HEAD, SVNRevision.HEAD, true);
+ }
+ } catch (SVNException e) {
+ e.printStackTrace();
+ }
}
@Override
public void commit(String[] names) throws IOException {
+ ISVNOptions options = SVNWCUtil.createDefaultOptions(true);
+ SVNClientManager ourClientManager =
+ SVNClientManager.newInstance(options, svnUsername, svnPassword);
+
+ File[] files = new File[names.length];
+ for (int i=0; i<names.length; i++)
+ files[i] = new File(localPath+File.separator+names[i]);
+
try {
- SVNRepositoryLocation location = SVNRepositoryLocation.parseURL(svnPath);
- SVNRepository repository = SVNRepositoryFactory.create(location);
- repository.setCredentialsProvider(new SVNSimpleCredentialsProvider(
- svnUsername, svnPassword));
-
- File directory = new File(localPath);
- ISVNWorkspace workspace = SVNWorkspaceManager.createWorkspace("file",
- directory.getAbsolutePath());
- workspace.setCredentials(svnUsername, svnPassword);
- workspace.commit(names, "New content", true, true);
- } catch (SVNException e) {
- throw new IOException(e.getMessage());
- }
+ ourClientManager.getCommitClient().doCommit(files, false,
+ "New content", true, true);
+ } catch (SVNException e) {
+ e.printStackTrace();
+ throw new IOException(e.getMessage());
+ }
}
@Override
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/portlet/ContentPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/portlet/ContentPortlet.java 2005-08-18 15:43:12 UTC (rev 893)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/portlet/ContentPortlet.java 2005-08-18 16:44:30 UTC (rev 894)
@@ -15,7 +15,6 @@
import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.portlet.JBossRenderResponse;
-import org.tmatesoft.svn.core.io.SVNException;
import javax.portlet.*;
@@ -93,7 +92,7 @@
* @throws SVNException
*/
abstract protected Object generateContent(JBossRenderRequest rReq,
- String portalName) throws IOException, SVNException;
+ String portalName) throws IOException;
/**
* Displays the portlet's content on its output.
Modified: trunk/forge/portal-extensions/forge-forums/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-forums/maven.xml 2005-08-18 15:43:12 UTC (rev 893)
+++ trunk/forge/portal-extensions/forge-forums/maven.xml 2005-08-18 16:44:30 UTC (rev 894)
@@ -6,9 +6,7 @@
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
<goal name="prj-install">
<ant:copy todir="${local.deploy.dir}">
- <ant:fileset dir="to-copy">
- <ant:include name="portal-forums.ear/**" />
- </ant:fileset>
+ <ant:fileset dir="to-copy" />
</ant:copy>
</goal>
Modified: trunk/forge/portal-extensions/forge-forums/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-forums/project.xml 2005-08-18 15:43:12 UTC (rev 893)
+++ trunk/forge/portal-extensions/forge-forums/project.xml 2005-08-18 16:44:30 UTC (rev 894)
@@ -7,7 +7,7 @@
<project>
<pomVersion>3</pomVersion>
<id>jbossforums</id>
- <name>JBoss Forumsi with forge fixes</name>
+ <name>JBoss Forums with forge fixes</name>
<currentVersion>1.0</currentVersion>
<organization>
<name>Jboss team</name>
Modified: trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java
===================================================================
--- trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java 2005-08-18 15:43:12 UTC (rev 893)
+++ trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java 2005-08-18 16:44:30 UTC (rev 894)
@@ -93,6 +93,7 @@
// Commiting.
synchronized (toCommit) {
cm.commit(toCommit.toArray(new String[0]));
+ toCommit.clear();
}
synchronized (nodeWatchers) {
@@ -126,12 +127,14 @@
}
public void create() throws Exception {
+ System.out.println("0");
}
@EJB
private ForgeTimerLocal timer;
public void start() throws Exception {
+ System.out.println("1");
forgeHelper = new ForgeHelper();
// Getting a root-relative content manager.
@@ -142,7 +145,7 @@
nodeWatchers = Collections.synchronizedMap(
new HashMap<CacheKey, NodeWatcher>());
toCommit = new HashSet<String>();
-
+ System.out.println("2");
// First repo update & possible checkout.
try {
cm.update();
@@ -150,16 +153,17 @@
log.warn(e);
e.printStackTrace();
}
-
+ System.out.println("3");
// Adding blog updater node watcher.
addNodeWatcher(null, BlogUpdaterNodeWatcher.class.getName(),
new BlogUpdaterNodeWatcher());
// Setting the default timer interval.
timerInterval = DEFAULT_TIMER_INTERVAL;
-
+ System.out.println("4");
// And starting the timer.
timer.scheduleTimer(DEFAULT_TIMER_INTERVAL);
+ System.out.println("5");
}
public void stop() {
Modified: trunk/forge/portal-extensions/maven.xml
===================================================================
--- trunk/forge/portal-extensions/maven.xml 2005-08-18 15:43:12 UTC (rev 893)
+++ trunk/forge/portal-extensions/maven.xml 2005-08-18 16:44:30 UTC (rev 894)
@@ -114,7 +114,8 @@
1. build.properties
2. forge-common/src/etc/org/jboss/forge/common/forge.properties
3. blojsom/to-copy/blojsom.war/WEB-INF/blojsom.properties
-4. federation-register/src/web/WEB-INF/faces-config (only for the JOSF portal).
+4. forge-login/to-copy/portal-login-ds.xml
+5. federation-register/src/web/WEB-INF/faces-config (only for the JOSF portal).
Available goals:
- help - prints this info
Modified: trunk/forge/portal-extensions/mysql-connector/maven.xml
===================================================================
--- trunk/forge/portal-extensions/mysql-connector/maven.xml 2005-08-18 15:43:12 UTC (rev 893)
+++ trunk/forge/portal-extensions/mysql-connector/maven.xml 2005-08-18 16:44:30 UTC (rev 894)
@@ -14,7 +14,7 @@
<goal name="prj-install">
<ant:copy
- file="mysql-connector-java-3.1.8-bin.jar"
+ file="mysql-connector-java-3.1.10-bin.jar"
todir="${local.deploy.dir}/../lib" overwrite="no" />
</goal>
</project>
\ No newline at end of file
Added: trunk/forge/portal-extensions/mysql-connector/mysql-connector-java-3.1.10-bin.jar
===================================================================
(Binary files differ)
Property changes on: trunk/forge/portal-extensions/mysql-connector/mysql-connector-java-3.1.10-bin.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/forge/portal-extensions/mysql-connector/mysql-connector-java-3.1.8-bin.jar
===================================================================
(Binary files differ)
|
