branch feature/GIT updated (2a6a5a5 -> 6613d3f)
This is an automated email from the git hooks/post-receive script. New change to branch feature/GIT in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git from 2a6a5a5 Use of Maven modules new 6613d3f Add packages to make the modules more independant The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6613d3f8ed8896776339d1ee0ed8245879b26514 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Wed May 13 10:24:47 2015 +0200 Add packages to make the modules more independant Summary of changes: .gitignore => swe-git/.gitignore | 0 .../scmwebeditor/{ => git}/GitConnection.java | 7 ++++-- .../nuiton/scmwebeditor/{ => git}/GitProvider.java | 5 ++++- swe-git/src/main/resources/log4j.properties | 2 +- swe-git/src/main/resources/scmwebeditor.properties | 26 ---------------------- .gitignore => swe-scm-api/.gitignore | 0 .../{ => api}/OperationNotSupportedException.java | 2 +- .../scmwebeditor/{ => api}/ScmConnection.java | 4 ++-- .../{ => api}/ScmNotFoundException.java | 2 +- .../nuiton/scmwebeditor/{ => api}/ScmProvider.java | 2 +- .../nuiton/scmwebeditor/{ => api}/ScmSession.java | 2 +- .../org/nuiton/scmwebeditor/{ => api}/ScmUser.java | 2 +- .../scmwebeditor/{ => api}/ScmWebEditorConfig.java | 2 +- .../{ => api}/ScmWebEditorConfigOption.java | 2 +- .../scmwebeditor/{ => api}/dto/BrowseDto.java | 2 +- .../{ => api}/dto/BrowseResultDto.java | 2 +- .../scmwebeditor/{ => api}/dto/CommitDto.java | 2 +- .../{ => api}/dto/CommitResultDto.java | 2 +- .../scmwebeditor/{ => api}/dto/UploadDto.java | 2 +- .../{ => api}/dto/UploadResultDto.java | 2 +- swe-scm-api/src/main/resources/log4j.properties | 2 +- .../src/main/resources/scmwebeditor.properties | 4 ++-- .gitignore => swe-svn/.gitignore | 0 .../scmwebeditor/{ => svn}/SvnConnection.java | 6 +++-- .../nuiton/scmwebeditor/{ => svn}/SvnProvider.java | 5 ++++- swe-svn/src/main/resources/log4j.properties | 2 +- swe-svn/src/main/resources/scmwebeditor.properties | 26 ---------------------- .gitignore => swe-ui-web/.gitignore | 0 .../ScmWebEditorApplicationListener.java | 2 +- .../{ => uiweb}/SweSessionListener.java | 3 ++- .../actions/AbstractScmWebEditorAction.java | 8 +++---- .../{ => uiweb}/actions/BrowseAction.java | 14 ++++++------ .../{ => uiweb}/actions/EditAction.java | 8 +++---- .../{ => uiweb}/actions/LogoutAction.java | 6 ++--- .../{ => uiweb}/actions/PreviewAction.java | 2 +- .../{ => uiweb}/actions/ResetAction.java | 6 ++--- .../{ => uiweb}/actions/SaveAction.java | 2 +- .../actions/ScmWebEditorCommitAction.java | 12 +++++----- .../actions/ScmWebEditorMainAction.java | 4 ++-- .../{ => uiweb}/actions/UploadAction.java | 10 ++++----- swe-ui-web/src/main/resources/log4j.properties | 2 +- .../src/main/resources/scmwebeditor.properties | 26 ---------------------- swe-ui-web/src/main/resources/struts.xml | 24 ++++++++++---------- swe-ui-web/src/main/webapp/WEB-INF/web.xml | 4 ++-- 44 files changed, 91 insertions(+), 157 deletions(-) copy .gitignore => swe-git/.gitignore (100%) rename swe-git/src/main/java/org/nuiton/scmwebeditor/{ => git}/GitConnection.java (99%) rename swe-git/src/main/java/org/nuiton/scmwebeditor/{ => git}/GitProvider.java (94%) delete mode 100644 swe-git/src/main/resources/scmwebeditor.properties copy .gitignore => swe-scm-api/.gitignore (100%) rename swe-scm-api/src/main/java/org/nuiton/scmwebeditor/{ => api}/OperationNotSupportedException.java (86%) rename swe-scm-api/src/main/java/org/nuiton/scmwebeditor/{ => api}/ScmConnection.java (97%) rename swe-scm-api/src/main/java/org/nuiton/scmwebeditor/{ => api}/ScmNotFoundException.java (84%) rename swe-scm-api/src/main/java/org/nuiton/scmwebeditor/{ => api}/ScmProvider.java (98%) rename swe-scm-api/src/main/java/org/nuiton/scmwebeditor/{ => api}/ScmSession.java (97%) rename swe-scm-api/src/main/java/org/nuiton/scmwebeditor/{ => api}/ScmUser.java (97%) rename swe-scm-api/src/main/java/org/nuiton/scmwebeditor/{ => api}/ScmWebEditorConfig.java (98%) rename swe-scm-api/src/main/java/org/nuiton/scmwebeditor/{ => api}/ScmWebEditorConfigOption.java (98%) rename swe-scm-api/src/main/java/org/nuiton/scmwebeditor/{ => api}/dto/BrowseDto.java (96%) rename swe-scm-api/src/main/java/org/nuiton/scmwebeditor/{ => api}/dto/BrowseResultDto.java (97%) rename swe-scm-api/src/main/java/org/nuiton/scmwebeditor/{ => api}/dto/CommitDto.java (97%) rename swe-scm-api/src/main/java/org/nuiton/scmwebeditor/{ => api}/dto/CommitResultDto.java (97%) rename swe-scm-api/src/main/java/org/nuiton/scmwebeditor/{ => api}/dto/UploadDto.java (97%) rename swe-scm-api/src/main/java/org/nuiton/scmwebeditor/{ => api}/dto/UploadResultDto.java (95%) copy .gitignore => swe-svn/.gitignore (100%) rename swe-svn/src/main/java/org/nuiton/scmwebeditor/{ => svn}/SvnConnection.java (99%) rename swe-svn/src/main/java/org/nuiton/scmwebeditor/{ => svn}/SvnProvider.java (91%) delete mode 100644 swe-svn/src/main/resources/scmwebeditor.properties copy .gitignore => swe-ui-web/.gitignore (100%) rename swe-ui-web/src/main/java/org/nuiton/scmwebeditor/{ => uiweb}/ScmWebEditorApplicationListener.java (97%) rename swe-ui-web/src/main/java/org/nuiton/scmwebeditor/{ => uiweb}/SweSessionListener.java (93%) rename swe-ui-web/src/main/java/org/nuiton/scmwebeditor/{ => uiweb}/actions/AbstractScmWebEditorAction.java (98%) rename swe-ui-web/src/main/java/org/nuiton/scmwebeditor/{ => uiweb}/actions/BrowseAction.java (96%) rename swe-ui-web/src/main/java/org/nuiton/scmwebeditor/{ => uiweb}/actions/EditAction.java (96%) rename swe-ui-web/src/main/java/org/nuiton/scmwebeditor/{ => uiweb}/actions/LogoutAction.java (95%) rename swe-ui-web/src/main/java/org/nuiton/scmwebeditor/{ => uiweb}/actions/PreviewAction.java (98%) rename swe-ui-web/src/main/java/org/nuiton/scmwebeditor/{ => uiweb}/actions/ResetAction.java (95%) rename swe-ui-web/src/main/java/org/nuiton/scmwebeditor/{ => uiweb}/actions/SaveAction.java (97%) rename swe-ui-web/src/main/java/org/nuiton/scmwebeditor/{ => uiweb}/actions/ScmWebEditorCommitAction.java (96%) rename swe-ui-web/src/main/java/org/nuiton/scmwebeditor/{ => uiweb}/actions/ScmWebEditorMainAction.java (97%) rename swe-ui-web/src/main/java/org/nuiton/scmwebeditor/{ => uiweb}/actions/UploadAction.java (95%) delete mode 100644 swe-ui-web/src/main/resources/scmwebeditor.properties -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/GIT in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 6613d3f8ed8896776339d1ee0ed8245879b26514 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Wed May 13 10:24:47 2015 +0200 Add packages to make the modules more independant --- swe-git/.gitignore | 10 +++++++++ .../scmwebeditor/{ => git}/GitConnection.java | 7 ++++-- .../nuiton/scmwebeditor/{ => git}/GitProvider.java | 5 ++++- swe-git/src/main/resources/log4j.properties | 2 +- swe-git/src/main/resources/scmwebeditor.properties | 26 ---------------------- swe-scm-api/.gitignore | 10 +++++++++ .../{ => api}/OperationNotSupportedException.java | 2 +- .../scmwebeditor/{ => api}/ScmConnection.java | 4 ++-- .../{ => api}/ScmNotFoundException.java | 2 +- .../nuiton/scmwebeditor/{ => api}/ScmProvider.java | 2 +- .../nuiton/scmwebeditor/{ => api}/ScmSession.java | 2 +- .../org/nuiton/scmwebeditor/{ => api}/ScmUser.java | 2 +- .../scmwebeditor/{ => api}/ScmWebEditorConfig.java | 2 +- .../{ => api}/ScmWebEditorConfigOption.java | 2 +- .../scmwebeditor/{ => api}/dto/BrowseDto.java | 2 +- .../{ => api}/dto/BrowseResultDto.java | 2 +- .../scmwebeditor/{ => api}/dto/CommitDto.java | 2 +- .../{ => api}/dto/CommitResultDto.java | 2 +- .../scmwebeditor/{ => api}/dto/UploadDto.java | 2 +- .../{ => api}/dto/UploadResultDto.java | 2 +- swe-scm-api/src/main/resources/log4j.properties | 2 +- .../src/main/resources/scmwebeditor.properties | 4 ++-- swe-svn/.gitignore | 10 +++++++++ .../scmwebeditor/{ => svn}/SvnConnection.java | 6 +++-- .../nuiton/scmwebeditor/{ => svn}/SvnProvider.java | 5 ++++- swe-svn/src/main/resources/log4j.properties | 2 +- swe-svn/src/main/resources/scmwebeditor.properties | 26 ---------------------- swe-ui-web/.gitignore | 10 +++++++++ .../ScmWebEditorApplicationListener.java | 2 +- .../{ => uiweb}/SweSessionListener.java | 3 ++- .../actions/AbstractScmWebEditorAction.java | 8 +++---- .../{ => uiweb}/actions/BrowseAction.java | 14 ++++++------ .../{ => uiweb}/actions/EditAction.java | 8 +++---- .../{ => uiweb}/actions/LogoutAction.java | 6 ++--- .../{ => uiweb}/actions/PreviewAction.java | 2 +- .../{ => uiweb}/actions/ResetAction.java | 6 ++--- .../{ => uiweb}/actions/SaveAction.java | 2 +- .../actions/ScmWebEditorCommitAction.java | 12 +++++----- .../actions/ScmWebEditorMainAction.java | 4 ++-- .../{ => uiweb}/actions/UploadAction.java | 10 ++++----- swe-ui-web/src/main/resources/log4j.properties | 2 +- .../src/main/resources/scmwebeditor.properties | 26 ---------------------- swe-ui-web/src/main/resources/struts.xml | 24 ++++++++++---------- swe-ui-web/src/main/webapp/WEB-INF/web.xml | 4 ++-- 44 files changed, 131 insertions(+), 157 deletions(-) diff --git a/swe-git/.gitignore b/swe-git/.gitignore new file mode 100644 index 0000000..ce95043 --- /dev/null +++ b/swe-git/.gitignore @@ -0,0 +1,10 @@ +/target +/.idea +/*.ipr +/*.iml +/*.iws +/*~ +/*~ +/.settings/ +/.classpath +/.project diff --git a/swe-git/src/main/java/org/nuiton/scmwebeditor/GitConnection.java b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java similarity index 99% rename from swe-git/src/main/java/org/nuiton/scmwebeditor/GitConnection.java rename to swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java index 5bdab59..060b6a0 100644 --- a/swe-git/src/main/java/org/nuiton/scmwebeditor/GitConnection.java +++ b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor; +package org.nuiton.scmwebeditor.git; import com.google.common.collect.Lists; import org.apache.commons.io.FileUtils; @@ -37,7 +37,10 @@ import org.eclipse.jgit.storage.file.FileRepositoryBuilder; import org.eclipse.jgit.transport.CredentialsProvider; import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider; import org.eclipse.jgit.treewalk.TreeWalk; -import org.nuiton.scmwebeditor.dto.*; +import org.nuiton.scmwebeditor.api.ScmConnection; +import org.nuiton.scmwebeditor.api.ScmNotFoundException; +import org.nuiton.scmwebeditor.api.ScmWebEditorConfig; +import org.nuiton.scmwebeditor.api.dto.*; import javax.naming.AuthenticationException; import java.io.File; diff --git a/swe-git/src/main/java/org/nuiton/scmwebeditor/GitProvider.java b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java similarity index 94% rename from swe-git/src/main/java/org/nuiton/scmwebeditor/GitProvider.java rename to swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java index ddcc80a..525ef7b 100644 --- a/swe-git/src/main/java/org/nuiton/scmwebeditor/GitProvider.java +++ b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor; +package org.nuiton.scmwebeditor.git; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -28,6 +28,9 @@ import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.transport.CredentialsProvider; import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider; +import org.nuiton.scmwebeditor.api.OperationNotSupportedException; +import org.nuiton.scmwebeditor.api.ScmConnection; +import org.nuiton.scmwebeditor.api.ScmProvider; import java.io.IOException; import java.util.ArrayList; diff --git a/swe-git/src/main/resources/log4j.properties b/swe-git/src/main/resources/log4j.properties index d442781..86b4c81 100644 --- a/swe-git/src/main/resources/log4j.properties +++ b/swe-git/src/main/resources/log4j.properties @@ -47,7 +47,7 @@ log4j.appender.rolling.layout=org.apache.log4j.PatternLayout log4j.appender.rolling.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n # package level -log4j.logger.org.nuiton.scmwebeditor.actions.SaveAction=DEBUG +log4j.logger.org.nuiton.scmwebeditor.uiweb.actions.SaveAction=DEBUG log4j.logger.org.chorem.jtimer=DEBUG log4j.logger.org.chorem.jtimer.ws=DEBUG diff --git a/swe-git/src/main/resources/scmwebeditor.properties b/swe-git/src/main/resources/scmwebeditor.properties deleted file mode 100644 index 9035e4c..0000000 --- a/swe-git/src/main/resources/scmwebeditor.properties +++ /dev/null @@ -1,26 +0,0 @@ -### -# #%L -# ScmWebEditor -# %% -# Copyright (C) 2009 - 2011 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -swe.editableFiles=text,xml,javascript,sh,x-tex,x-java -swe.cookiePrivateKey=ZvcCyhfRTVZoQz3B/IpYdw== -swe.localRepositoriesPath=/var/local/swe -swe.provider.SVN=org.nuiton.scmwebeditor.SvnProvider -swe.provider.Git=org.nuiton.scmwebeditor.GitProvider \ No newline at end of file diff --git a/swe-scm-api/.gitignore b/swe-scm-api/.gitignore new file mode 100644 index 0000000..ce95043 --- /dev/null +++ b/swe-scm-api/.gitignore @@ -0,0 +1,10 @@ +/target +/.idea +/*.ipr +/*.iml +/*.iws +/*~ +/*~ +/.settings/ +/.classpath +/.project diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/OperationNotSupportedException.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/OperationNotSupportedException.java similarity index 86% rename from swe-scm-api/src/main/java/org/nuiton/scmwebeditor/OperationNotSupportedException.java rename to swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/OperationNotSupportedException.java index 4cbc2dc..0601eb5 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/OperationNotSupportedException.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/OperationNotSupportedException.java @@ -1,4 +1,4 @@ -package org.nuiton.scmwebeditor; +package org.nuiton.scmwebeditor.api; /** * An exception called when the requested operation is not supported by the SCM diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmConnection.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmConnection.java similarity index 97% rename from swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmConnection.java rename to swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmConnection.java index d148a85..a8d851b 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmConnection.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmConnection.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor; +package org.nuiton.scmwebeditor.api; -import org.nuiton.scmwebeditor.dto.*; +import org.nuiton.scmwebeditor.api.dto.*; import javax.naming.AuthenticationException; import java.io.File; diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmNotFoundException.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmNotFoundException.java similarity index 84% rename from swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmNotFoundException.java rename to swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmNotFoundException.java index 241e3b8..02cdf4a 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmNotFoundException.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmNotFoundException.java @@ -1,4 +1,4 @@ -package org.nuiton.scmwebeditor; +package org.nuiton.scmwebeditor.api; /** * An exception called when the requested SCM doesn't exist diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmProvider.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmProvider.java similarity index 98% rename from swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmProvider.java rename to swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmProvider.java index 13a83c7..3f60775 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmProvider.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmProvider.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor; +package org.nuiton.scmwebeditor.api; import java.util.List; diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmSession.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmSession.java similarity index 97% rename from swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmSession.java rename to swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmSession.java index f3f991d..f54c7d1 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmSession.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmSession.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor; +package org.nuiton.scmwebeditor.api; import java.util.HashMap; import java.util.Map; diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmUser.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmUser.java similarity index 97% rename from swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmUser.java rename to swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmUser.java index 1f625d9..71ec796 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmUser.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmUser.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor; +package org.nuiton.scmwebeditor.api; public class ScmUser { diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorConfig.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmWebEditorConfig.java similarity index 98% rename from swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorConfig.java rename to swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmWebEditorConfig.java index 08f2046..cf92feb 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorConfig.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmWebEditorConfig.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor; +package org.nuiton.scmwebeditor.api; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorConfigOption.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmWebEditorConfigOption.java similarity index 98% rename from swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorConfigOption.java rename to swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmWebEditorConfigOption.java index 3deabf2..c0fb6df 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorConfigOption.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/ScmWebEditorConfigOption.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor; +package org.nuiton.scmwebeditor.api; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ConfigOptionDef; diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/BrowseDto.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/BrowseDto.java similarity index 96% rename from swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/BrowseDto.java rename to swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/BrowseDto.java index 9226901..cb1f5bc 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/BrowseDto.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/BrowseDto.java @@ -1,4 +1,4 @@ -package org.nuiton.scmwebeditor.dto; +package org.nuiton.scmwebeditor.api.dto; public class BrowseDto { diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/BrowseResultDto.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/BrowseResultDto.java similarity index 97% rename from swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/BrowseResultDto.java rename to swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/BrowseResultDto.java index b0faf47..2ae5715 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/BrowseResultDto.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/BrowseResultDto.java @@ -1,4 +1,4 @@ -package org.nuiton.scmwebeditor.dto; +package org.nuiton.scmwebeditor.api.dto; import java.util.HashMap; diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/CommitDto.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/CommitDto.java similarity index 97% rename from swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/CommitDto.java rename to swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/CommitDto.java index 2044d99..3ff5723 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/CommitDto.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/CommitDto.java @@ -1,4 +1,4 @@ -package org.nuiton.scmwebeditor.dto; +package org.nuiton.scmwebeditor.api.dto; public class CommitDto { diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/CommitResultDto.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/CommitResultDto.java similarity index 97% rename from swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/CommitResultDto.java rename to swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/CommitResultDto.java index 5132bc0..7ef2696 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/CommitResultDto.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/CommitResultDto.java @@ -1,4 +1,4 @@ -package org.nuiton.scmwebeditor.dto; +package org.nuiton.scmwebeditor.api.dto; public class CommitResultDto { diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/UploadDto.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/UploadDto.java similarity index 97% rename from swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/UploadDto.java rename to swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/UploadDto.java index 283d2b6..78b392e 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/UploadDto.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/UploadDto.java @@ -1,4 +1,4 @@ -package org.nuiton.scmwebeditor.dto; +package org.nuiton.scmwebeditor.api.dto; import java.io.File; diff --git a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/UploadResultDto.java b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/UploadResultDto.java similarity index 95% rename from swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/UploadResultDto.java rename to swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/UploadResultDto.java index aa03bb1..e58b3b2 100644 --- a/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/dto/UploadResultDto.java +++ b/swe-scm-api/src/main/java/org/nuiton/scmwebeditor/api/dto/UploadResultDto.java @@ -1,4 +1,4 @@ -package org.nuiton.scmwebeditor.dto; +package org.nuiton.scmwebeditor.api.dto; public class UploadResultDto { diff --git a/swe-scm-api/src/main/resources/log4j.properties b/swe-scm-api/src/main/resources/log4j.properties index d442781..86b4c81 100644 --- a/swe-scm-api/src/main/resources/log4j.properties +++ b/swe-scm-api/src/main/resources/log4j.properties @@ -47,7 +47,7 @@ log4j.appender.rolling.layout=org.apache.log4j.PatternLayout log4j.appender.rolling.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n # package level -log4j.logger.org.nuiton.scmwebeditor.actions.SaveAction=DEBUG +log4j.logger.org.nuiton.scmwebeditor.uiweb.actions.SaveAction=DEBUG log4j.logger.org.chorem.jtimer=DEBUG log4j.logger.org.chorem.jtimer.ws=DEBUG diff --git a/swe-scm-api/src/main/resources/scmwebeditor.properties b/swe-scm-api/src/main/resources/scmwebeditor.properties index 9035e4c..ac2ef8b 100644 --- a/swe-scm-api/src/main/resources/scmwebeditor.properties +++ b/swe-scm-api/src/main/resources/scmwebeditor.properties @@ -22,5 +22,5 @@ swe.editableFiles=text,xml,javascript,sh,x-tex,x-java swe.cookiePrivateKey=ZvcCyhfRTVZoQz3B/IpYdw== swe.localRepositoriesPath=/var/local/swe -swe.provider.SVN=org.nuiton.scmwebeditor.SvnProvider -swe.provider.Git=org.nuiton.scmwebeditor.GitProvider \ No newline at end of file +swe.provider.SVN=org.nuiton.scmwebeditor.svn.SvnProvider +swe.provider.Git=org.nuiton.scmwebeditor.git.GitProvider \ No newline at end of file diff --git a/swe-svn/.gitignore b/swe-svn/.gitignore new file mode 100644 index 0000000..ce95043 --- /dev/null +++ b/swe-svn/.gitignore @@ -0,0 +1,10 @@ +/target +/.idea +/*.ipr +/*.iml +/*.iws +/*~ +/*~ +/.settings/ +/.classpath +/.project diff --git a/swe-svn/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java b/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java similarity index 99% rename from swe-svn/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java rename to swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java index b88f13b..459e3a9 100644 --- a/swe-svn/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java +++ b/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java @@ -19,12 +19,14 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor; +package org.nuiton.scmwebeditor.svn; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.scmwebeditor.dto.*; +import org.nuiton.scmwebeditor.api.ScmConnection; +import org.nuiton.scmwebeditor.api.ScmWebEditorConfig; +import org.nuiton.scmwebeditor.api.dto.*; import org.nuiton.util.FileUtil; import org.tmatesoft.svn.core.*; import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager; diff --git a/swe-svn/src/main/java/org/nuiton/scmwebeditor/SvnProvider.java b/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnProvider.java similarity index 91% rename from swe-svn/src/main/java/org/nuiton/scmwebeditor/SvnProvider.java rename to swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnProvider.java index 94af21f..414ec11 100644 --- a/swe-svn/src/main/java/org/nuiton/scmwebeditor/SvnProvider.java +++ b/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnProvider.java @@ -20,10 +20,13 @@ * #L% */ -package org.nuiton.scmwebeditor; +package org.nuiton.scmwebeditor.svn; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.scmwebeditor.api.OperationNotSupportedException; +import org.nuiton.scmwebeditor.api.ScmConnection; +import org.nuiton.scmwebeditor.api.ScmProvider; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory; import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl; diff --git a/swe-svn/src/main/resources/log4j.properties b/swe-svn/src/main/resources/log4j.properties index d442781..86b4c81 100644 --- a/swe-svn/src/main/resources/log4j.properties +++ b/swe-svn/src/main/resources/log4j.properties @@ -47,7 +47,7 @@ log4j.appender.rolling.layout=org.apache.log4j.PatternLayout log4j.appender.rolling.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n # package level -log4j.logger.org.nuiton.scmwebeditor.actions.SaveAction=DEBUG +log4j.logger.org.nuiton.scmwebeditor.uiweb.actions.SaveAction=DEBUG log4j.logger.org.chorem.jtimer=DEBUG log4j.logger.org.chorem.jtimer.ws=DEBUG diff --git a/swe-svn/src/main/resources/scmwebeditor.properties b/swe-svn/src/main/resources/scmwebeditor.properties deleted file mode 100644 index 9035e4c..0000000 --- a/swe-svn/src/main/resources/scmwebeditor.properties +++ /dev/null @@ -1,26 +0,0 @@ -### -# #%L -# ScmWebEditor -# %% -# Copyright (C) 2009 - 2011 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -swe.editableFiles=text,xml,javascript,sh,x-tex,x-java -swe.cookiePrivateKey=ZvcCyhfRTVZoQz3B/IpYdw== -swe.localRepositoriesPath=/var/local/swe -swe.provider.SVN=org.nuiton.scmwebeditor.SvnProvider -swe.provider.Git=org.nuiton.scmwebeditor.GitProvider \ No newline at end of file diff --git a/swe-ui-web/.gitignore b/swe-ui-web/.gitignore new file mode 100644 index 0000000..ce95043 --- /dev/null +++ b/swe-ui-web/.gitignore @@ -0,0 +1,10 @@ +/target +/.idea +/*.ipr +/*.iml +/*.iws +/*~ +/*~ +/.settings/ +/.classpath +/.project diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorApplicationListener.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/ScmWebEditorApplicationListener.java similarity index 97% rename from swe-ui-web/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorApplicationListener.java rename to swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/ScmWebEditorApplicationListener.java index 660ea05..9e2e510 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorApplicationListener.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/ScmWebEditorApplicationListener.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor; +package org.nuiton.scmwebeditor.uiweb; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/SweSessionListener.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/SweSessionListener.java similarity index 93% rename from swe-ui-web/src/main/java/org/nuiton/scmwebeditor/SweSessionListener.java rename to swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/SweSessionListener.java index 42e71a8..4c4de02 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/SweSessionListener.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/SweSessionListener.java @@ -1,8 +1,9 @@ -package org.nuiton.scmwebeditor; +package org.nuiton.scmwebeditor.uiweb; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.scmwebeditor.api.ScmWebEditorConfig; import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionListener; diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/AbstractScmWebEditorAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/AbstractScmWebEditorAction.java similarity index 98% rename from swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/AbstractScmWebEditorAction.java rename to swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/AbstractScmWebEditorAction.java index 2069560..577b601 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/AbstractScmWebEditorAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/AbstractScmWebEditorAction.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor.actions; +package org.nuiton.scmwebeditor.uiweb.actions; import com.opensymphony.xwork2.ActionContext; import info.monitorenter.cpdetector.io.*; @@ -31,9 +31,9 @@ import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.sax.BodyContentHandler; -import org.nuiton.scmwebeditor.ScmProvider; -import org.nuiton.scmwebeditor.ScmSession; -import org.nuiton.scmwebeditor.ScmWebEditorConfig; +import org.nuiton.scmwebeditor.api.ScmProvider; +import org.nuiton.scmwebeditor.api.ScmSession; +import org.nuiton.scmwebeditor.api.ScmWebEditorConfig; import org.nuiton.web.struts2.BaseAction; import org.xml.sax.SAXException; diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/BrowseAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/BrowseAction.java similarity index 96% rename from swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/BrowseAction.java rename to swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/BrowseAction.java index 36c34b1..8cedd2d 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/BrowseAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/BrowseAction.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor.actions; +package org.nuiton.scmwebeditor.uiweb.actions; import com.google.common.collect.Lists; import com.jgeppert.struts2.jquery.tree.result.TreeNode; @@ -28,12 +28,12 @@ import org.apache.commons.logging.LogFactory; import org.apache.shiro.codec.Base64; import org.apache.shiro.crypto.BlowfishCipherService; import org.apache.struts2.interceptor.ServletResponseAware; -import org.nuiton.scmwebeditor.OperationNotSupportedException; -import org.nuiton.scmwebeditor.ScmConnection; -import org.nuiton.scmwebeditor.ScmProvider; -import org.nuiton.scmwebeditor.ScmWebEditorConfig; -import org.nuiton.scmwebeditor.dto.BrowseDto; -import org.nuiton.scmwebeditor.dto.BrowseResultDto; +import org.nuiton.scmwebeditor.api.OperationNotSupportedException; +import org.nuiton.scmwebeditor.api.ScmConnection; +import org.nuiton.scmwebeditor.api.ScmProvider; +import org.nuiton.scmwebeditor.api.ScmWebEditorConfig; +import org.nuiton.scmwebeditor.api.dto.BrowseDto; +import org.nuiton.scmwebeditor.api.dto.BrowseResultDto; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/EditAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java similarity index 96% rename from swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/EditAction.java rename to swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java index 101feac..cdab71f 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/EditAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java @@ -1,4 +1,4 @@ -package org.nuiton.scmwebeditor.actions; +package org.nuiton.scmwebeditor.uiweb.actions; import org.apache.commons.io.FileUtils; @@ -6,9 +6,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.shiro.codec.Base64; import org.apache.shiro.crypto.BlowfishCipherService; -import org.nuiton.scmwebeditor.ScmConnection; -import org.nuiton.scmwebeditor.ScmProvider; -import org.nuiton.scmwebeditor.ScmWebEditorConfig; +import org.nuiton.scmwebeditor.api.ScmConnection; +import org.nuiton.scmwebeditor.api.ScmProvider; +import org.nuiton.scmwebeditor.api.ScmWebEditorConfig; import javax.naming.AuthenticationException; import javax.servlet.http.Cookie; diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/LogoutAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/LogoutAction.java similarity index 95% rename from swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/LogoutAction.java rename to swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/LogoutAction.java index 46eb571..cee4d05 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/LogoutAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/LogoutAction.java @@ -19,14 +19,14 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor.actions; +package org.nuiton.scmwebeditor.uiweb.actions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; import org.apache.struts2.interceptor.ServletResponseAware; -import org.nuiton.scmwebeditor.ScmConnection; -import org.nuiton.scmwebeditor.ScmProvider; +import org.nuiton.scmwebeditor.api.ScmConnection; +import org.nuiton.scmwebeditor.api.ScmProvider; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/PreviewAction.java similarity index 98% rename from swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java rename to swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/PreviewAction.java index 1298d66..c315b9d 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/PreviewAction.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor.actions; +package org.nuiton.scmwebeditor.uiweb.actions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ResetAction.java similarity index 95% rename from swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java rename to swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ResetAction.java index 4bb788a..e18c166 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ResetAction.java @@ -19,13 +19,13 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor.actions; +package org.nuiton.scmwebeditor.uiweb.actions; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.scmwebeditor.ScmConnection; -import org.nuiton.scmwebeditor.ScmProvider; +import org.nuiton.scmwebeditor.api.ScmConnection; +import org.nuiton.scmwebeditor.api.ScmProvider; import javax.naming.AuthenticationException; import java.io.File; diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/SaveAction.java similarity index 97% rename from swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java rename to swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/SaveAction.java index afdc8d0..703a21f 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/SaveAction.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor.actions; +package org.nuiton.scmwebeditor.uiweb.actions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ScmWebEditorCommitAction.java similarity index 96% rename from swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java rename to swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ScmWebEditorCommitAction.java index 27875f0..9642dc5 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ScmWebEditorCommitAction.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor.actions; +package org.nuiton.scmwebeditor.uiweb.actions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -30,11 +30,11 @@ import org.apache.struts2.interceptor.ServletResponseAware; import org.dom4j.Document; import org.nuiton.jrst.JRST; import org.nuiton.jrst.legacy.JRSTReader; -import org.nuiton.scmwebeditor.ScmConnection; -import org.nuiton.scmwebeditor.ScmProvider; -import org.nuiton.scmwebeditor.ScmWebEditorConfig; -import org.nuiton.scmwebeditor.dto.CommitDto; -import org.nuiton.scmwebeditor.dto.CommitResultDto; +import org.nuiton.scmwebeditor.api.ScmConnection; +import org.nuiton.scmwebeditor.api.ScmProvider; +import org.nuiton.scmwebeditor.api.ScmWebEditorConfig; +import org.nuiton.scmwebeditor.api.dto.CommitDto; +import org.nuiton.scmwebeditor.api.dto.CommitResultDto; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ScmWebEditorMainAction.java similarity index 97% rename from swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java rename to swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ScmWebEditorMainAction.java index 549ad52..a0c189a 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/ScmWebEditorMainAction.java @@ -19,13 +19,13 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor.actions; +package org.nuiton.scmwebeditor.uiweb.actions; import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletResponseAware; -import org.nuiton.scmwebeditor.ScmWebEditorConfig; +import org.nuiton.scmwebeditor.api.ScmWebEditorConfig; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/UploadAction.java similarity index 95% rename from swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java rename to swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/UploadAction.java index 756bc69..65366dc 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/UploadAction.java @@ -19,15 +19,15 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.scmwebeditor.actions; +package org.nuiton.scmwebeditor.uiweb.actions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; -import org.nuiton.scmwebeditor.ScmConnection; -import org.nuiton.scmwebeditor.ScmProvider; -import org.nuiton.scmwebeditor.dto.UploadDto; -import org.nuiton.scmwebeditor.dto.UploadResultDto; +import org.nuiton.scmwebeditor.api.ScmConnection; +import org.nuiton.scmwebeditor.api.ScmProvider; +import org.nuiton.scmwebeditor.api.dto.UploadDto; +import org.nuiton.scmwebeditor.api.dto.UploadResultDto; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; diff --git a/swe-ui-web/src/main/resources/log4j.properties b/swe-ui-web/src/main/resources/log4j.properties index d442781..86b4c81 100644 --- a/swe-ui-web/src/main/resources/log4j.properties +++ b/swe-ui-web/src/main/resources/log4j.properties @@ -47,7 +47,7 @@ log4j.appender.rolling.layout=org.apache.log4j.PatternLayout log4j.appender.rolling.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n # package level -log4j.logger.org.nuiton.scmwebeditor.actions.SaveAction=DEBUG +log4j.logger.org.nuiton.scmwebeditor.uiweb.actions.SaveAction=DEBUG log4j.logger.org.chorem.jtimer=DEBUG log4j.logger.org.chorem.jtimer.ws=DEBUG diff --git a/swe-ui-web/src/main/resources/scmwebeditor.properties b/swe-ui-web/src/main/resources/scmwebeditor.properties deleted file mode 100644 index 9035e4c..0000000 --- a/swe-ui-web/src/main/resources/scmwebeditor.properties +++ /dev/null @@ -1,26 +0,0 @@ -### -# #%L -# ScmWebEditor -# %% -# Copyright (C) 2009 - 2011 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -swe.editableFiles=text,xml,javascript,sh,x-tex,x-java -swe.cookiePrivateKey=ZvcCyhfRTVZoQz3B/IpYdw== -swe.localRepositoriesPath=/var/local/swe -swe.provider.SVN=org.nuiton.scmwebeditor.SvnProvider -swe.provider.Git=org.nuiton.scmwebeditor.GitProvider \ No newline at end of file diff --git a/swe-ui-web/src/main/resources/struts.xml b/swe-ui-web/src/main/resources/struts.xml index ca64bec..a9f3907 100644 --- a/swe-ui-web/src/main/resources/struts.xml +++ b/swe-ui-web/src/main/resources/struts.xml @@ -64,19 +64,19 @@ <default-interceptor-ref name="scmwebeditorDefaultStack"/> - <action name="checkout" class="org.nuiton.scmwebeditor.actions.ScmWebEditorMainAction" method="execute"> + <action name="checkout" class="org.nuiton.scmwebeditor.uiweb.actions.ScmWebEditorMainAction" method="execute"> <result name="noParameter" >/WEB-INF/content/outConnection.jsp</result> <result name="errorPath" >/WEB-INF/content/badFileRedirect.jsp</result> </action> - <action name="edit" class="org.nuiton.scmwebeditor.actions.EditAction" method="edit"> + <action name="edit" class="org.nuiton.scmwebeditor.uiweb.actions.EditAction" method="edit"> <result name="noParameter" >/WEB-INF/content/outConnection.jsp</result> <result name="login" >/WEB-INF/content/privateScmRedirect.jsp</result> <result name="errorPath" >/WEB-INF/content/badFileRedirect.jsp</result> <result name="editPage" >/WEB-INF/content/modificationViewer.jsp</result> </action> - <action name="commit" class="org.nuiton.scmwebeditor.actions.ScmWebEditorCommitAction" method="execute"> + <action name="commit" class="org.nuiton.scmwebeditor.uiweb.actions.ScmWebEditorCommitAction" method="execute"> <result name="success" >/WEB-INF/content/redirect.jsp</result> <result name="login" >/WEB-INF/content/modificationViewer.jsp</result> <result name="error">/WEB-INF/content/badFileRedirect.jsp</result> @@ -85,39 +85,39 @@ <result name="fileModify">/WEB-INF/content/fileModify.jsp</result> </action> - <action name="save" class="org.nuiton.scmwebeditor.actions.SaveAction" method="save"> + <action name="save" class="org.nuiton.scmwebeditor.uiweb.actions.SaveAction" method="save"> <result>/WEB-INF/content/save.jsp</result> </action> - <action name="reset" class="org.nuiton.scmwebeditor.actions.ResetAction" > + <action name="reset" class="org.nuiton.scmwebeditor.uiweb.actions.ResetAction" > <result>/WEB-INF/content/reset.jsp</result> <result name="authError">/WEB-INF/content/reset.jsp</result> <result name="errorPath">/WEB-INF/content/reset.jsp</result> </action> - <action name="logout" class="org.nuiton.scmwebeditor.actions.LogoutAction" > + <action name="logout" class="org.nuiton.scmwebeditor.uiweb.actions.LogoutAction" > <result>/WEB-INF/content/logout.jsp</result> </action> - <action name="doUpload" class="org.nuiton.scmwebeditor.actions.UploadAction" > + <action name="doUpload" class="org.nuiton.scmwebeditor.uiweb.actions.UploadAction" > <result>/WEB-INF/content/uploadSuccess.jsp</result> <result name="redirect" >/WEB-INF/content/uploadForm.jsp</result> <result name="login" >/WEB-INF/content/uploadForm.jsp</result> <result name="error" >/WEB-INF/content/uploadForm.jsp</result> </action> - <action name="uploadFile" class="org.nuiton.scmwebeditor.actions.UploadAction" > + <action name="uploadFile" class="org.nuiton.scmwebeditor.uiweb.actions.UploadAction" > <result>/WEB-INF/content/upload.jsp</result> <result name="login" >/WEB-INF/content/upload.jsp</result> <result name="error" >/WEB-INF/content/upload.jsp</result> </action> - <action name="preview" class="org.nuiton.scmwebeditor.actions.PreviewAction" > + <action name="preview" class="org.nuiton.scmwebeditor.uiweb.actions.PreviewAction" > <result>/WEB-INF/content/preview.jsp</result> </action> - <action name="browse" class="org.nuiton.scmwebeditor.actions.BrowseAction" method="browse"> + <action name="browse" class="org.nuiton.scmwebeditor.uiweb.actions.BrowseAction" method="browse"> <param name="address"/> <result name="root">/WEB-INF/content/browse.jsp</result> <result name="success" type="json"> @@ -126,11 +126,11 @@ <result name="authError" >/WEB-INF/content/loginBrowse.jsp</result> </action> - <action name="getBranches" class="org.nuiton.scmwebeditor.actions.BrowseAction" method="listBranchesJSON"> + <action name="getBranches" class="org.nuiton.scmwebeditor.uiweb.actions.BrowseAction" method="listBranchesJSON"> <result name="success" type="json"/> </action> - <action name="detectScm" class="org.nuiton.scmwebeditor.actions.BrowseAction" method="detectScm"> + <action name="detectScm" class="org.nuiton.scmwebeditor.uiweb.actions.BrowseAction" method="detectScm"> <result name="success" type="json"/> </action> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/web.xml b/swe-ui-web/src/main/webapp/WEB-INF/web.xml index e4b3eb4..2963c3e 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/web.xml +++ b/swe-ui-web/src/main/webapp/WEB-INF/web.xml @@ -42,12 +42,12 @@ <listener> <description>sessionListener</description> - <listener-class>org.nuiton.scmwebeditor.SweSessionListener</listener-class> + <listener-class>org.nuiton.scmwebeditor.uiweb.SweSessionListener</listener-class> </listener> <listener> <description>Init</description> - <listener-class>org.nuiton.scmwebeditor.ScmWebEditorApplicationListener</listener-class> + <listener-class>org.nuiton.scmwebeditor.uiweb.ScmWebEditorApplicationListener</listener-class> </listener> </web-app> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm