August 2011 - Scmwebeditor-commits - mailman.cloud.codelutin.com

r234 - trunk/src/main/java/org/nuiton/scmwebeditor/actions
by kcardineaud＠users.nuiton.org 19 Aug '11

19 Aug '11

Author: kcardineaud Date: 2011-08-19 12:30:54 +0200 (Fri, 19 Aug 2011) New Revision: 234 Url: http://nuiton.org/repositories/revision/scmwebeditor/234 Log: #1691 Problem with authentification Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-08-19 10:20:00 UTC (rev 233) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-08-19 10:30:54 UTC (rev 234) @@ -234,8 +234,8 @@ password = getScmSession().getPassword(repositoryUUID); } else { - login = "anonymous"; - password = "anonymous"; + login = null; + password = null; } } else { @@ -269,8 +269,9 @@ } //On supprime le repertoire temporaire delTempDirectory(checkoutdir); - //redirect to a login page - + + username = null; + pw = null; getScmSession().delScmUser(repositoryUUID); return Action.LOGIN; @@ -383,7 +384,8 @@ request.setAttribute(ATTRIBUTE_BAD_LOGIN, true); //Suppression du repertoire temporaire delTempDirectory(checkoutdir); - + username = null; + pw = null; //on supprime la valeur stocke en session getScmSession().delScmUser(repositoryUUID); return Action.LOGIN;

1 0

r233 - trunk
by jcouteau＠users.nuiton.org 19 Aug '11

19 Aug '11

Author: jcouteau Date: 2011-08-19 12:20:00 +0200 (Fri, 19 Aug 2011) New Revision: 233 Url: http://nuiton.org/repositories/revision/scmwebeditor/233 Log: >From scmwebeditor -- Commited from my phone Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-08-19 10:15:32 UTC (rev 232) +++ trunk/changelog.txt 2011-08-19 10:20:00 UTC (rev 233) @@ -0,0 +1 @@ +just a test

1 0

r232 - trunk
by kcardineaud＠users.nuiton.org 19 Aug '11

19 Aug '11

Author: kcardineaud Date: 2011-08-19 12:15:32 +0200 (Fri, 19 Aug 2011) New Revision: 232 Url: http://nuiton.org/repositories/revision/scmwebeditor/232 Log: #1690 Can not preview a rst file Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 16:10:03 UTC (rev 231) +++ trunk/pom.xml 2011-08-19 10:15:32 UTC (rev 232) @@ -96,7 +96,7 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> <version>${nuitonI18nVersion}</version> - <scope>provided</scope> + <scope>runtime</scope> </dependency>

1 0

r231 - in trunk/src/main/java/org/nuiton/scmwebeditor: . actions
by kcardineaud＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: kcardineaud Date: 2011-08-18 18:10:03 +0200 (Thu, 18 Aug 2011) New Revision: 231 Url: http://nuiton.org/repositories/revision/scmwebeditor/231 Log: #1687 Can not edit a xml file Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-08-18 14:26:12 UTC (rev 230) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-08-18 16:10:03 UTC (rev 231) @@ -502,6 +502,21 @@ } } + + /** + * Recuperation des propriétés dans un fichier properties + * + * @param inStream le fichier contenant les propriétés + * @return un objet Properties contenant les propriétés du fichier + */ + public static Properties loadProperties(InputStream inStream) throws IOException , NullPointerException { + Properties properties = new Properties(); + + properties.load(inStream); + return properties; + + + } public ScmSession getScmSession() { Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-08-18 14:26:12 UTC (rev 230) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-08-18 16:10:03 UTC (rev 231) @@ -25,6 +25,7 @@ package org.nuiton.scmwebeditor.actions; import java.io.IOException; +import java.io.InputStream; import java.net.URL; import java.util.HashMap; import java.util.Iterator; @@ -345,10 +346,13 @@ Properties properties=null; String[] editableFiles=null; - + boolean errorReadingProperties = false; try { - properties = loadProperties("src/main/resources/scm.properties"); + InputStream inStream = getClass().getResourceAsStream("/scm.properties"); + + properties = loadProperties(inStream); + if(log.isDebugEnabled()) { log.debug("editableFiles: "+ properties.getProperty("editableFiles", "text")); @@ -359,9 +363,20 @@ if(log.isErrorEnabled()) { log.error("Can't read properties file", e ); } - editableFiles = new String[1]; - editableFiles[0] = "text"; + errorReadingProperties=true; + } catch (NullPointerException e) { + if(log.isErrorEnabled()) { + log.error("Can't read properties file", e ); + } + errorReadingProperties=true; } + + if(errorReadingProperties) { + editableFiles = new String[3]; + editableFiles[0] = "text"; + editableFiles[1] = "xml"; + editableFiles[2] = "x-java"; + } boolean editable =false;

1 0

r230 - trunk
by hudson＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: hudson Date: 2011-08-18 16:26:12 +0200 (Thu, 18 Aug 2011) New Revision: 230 Url: http://nuiton.org/repositories/revision/scmwebeditor/230 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 14:26:11 UTC (rev 229) +++ trunk/pom.xml 2011-08-18 14:26:12 UTC (rev 230) @@ -14,7 +14,7 @@ </parent> <artifactId>scmwebeditor</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> <dependencies> @@ -320,12 +320,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/scmwebeditor/tags/scmwebeditor-0.1 + scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/scmwebeditor/tags/scmwebeditor-0.1 + scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/scmwebeditor/tags/scmwebeditor-0.1</url> + <url>http://www.nuiton.org/repositories/browse/scmwebeditor/trunk</url> </scm> </project>

1 0

r229 - tags
by hudson＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: hudson Date: 2011-08-18 16:26:11 +0200 (Thu, 18 Aug 2011) New Revision: 229 Url: http://nuiton.org/repositories/revision/scmwebeditor/229 Log: [maven-release-plugin] copy for tag scmwebeditor-0.1 Added: tags/scmwebeditor-0.1/

1 0

r228 - /
by hudson＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: hudson Date: 2011-08-18 16:25:54 +0200 (Thu, 18 Aug 2011) New Revision: 228 Url: http://nuiton.org/repositories/revision/scmwebeditor/228 Log: Pffff... Oulala :D Added: branches/

1 0

r227 - /
by hudson＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: hudson Date: 2011-08-18 16:25:30 +0200 (Thu, 18 Aug 2011) New Revision: 227 Url: http://nuiton.org/repositories/revision/scmwebeditor/227 Log: Pffff... Oulala :D Added: tags/

1 0

r226 - trunk
by hudson＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: hudson Date: 2011-08-18 16:23:52 +0200 (Thu, 18 Aug 2011) New Revision: 226 Url: http://nuiton.org/repositories/revision/scmwebeditor/226 Log: [maven-release-plugin] prepare release scmwebeditor-0.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 14:16:01 UTC (rev 225) +++ trunk/pom.xml 2011-08-18 14:23:52 UTC (rev 226) @@ -1,7 +1,5 @@ <?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -16,7 +14,7 @@ </parent> <artifactId>scmwebeditor</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.1</version> <dependencies> @@ -229,7 +227,7 @@ <i18n.bundleOutputName>scmwebeditor-i18n</i18n.bundleOutputName> - <i18n.bundleOutputPackage/> + <i18n.bundleOutputPackage />  <redmine.releaseFiles> @@ -322,12 +320,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk + scm:svn:http://svn.nuiton.org/svn/scmwebeditor/tags/scmwebeditor-0.1 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk + scm:svn:http://svn.nuiton.org/svn/scmwebeditor/tags/scmwebeditor-0.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/scmwebeditor/trunk</url> + <url>http://www.nuiton.org/repositories/browse/scmwebeditor/tags/scmwebeditor-0.1</url> </scm> </project>

1 0

r225 - trunk
by tchemit＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: tchemit Date: 2011-08-18 16:16:01 +0200 (Thu, 18 Aug 2011) New Revision: 225 Url: http://nuiton.org/repositories/revision/scmwebeditor/225 Log: fix pom before release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 13:51:09 UTC (rev 224) +++ trunk/pom.xml 2011-08-18 14:16:01 UTC (rev 225) @@ -185,6 +185,16 @@ <role>Developer</role> </roles> </developer> + <developer> + <name>Kevin Cardineaud</name> + <id>kcardineaud</id> + <email>cardineaud(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> </developers> <organization> @@ -210,7 +220,7 @@ <struts2jqueryVersion>3.1.0</struts2jqueryVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> <nuitonUtilsVersion>2.2</nuitonUtilsVersion> - <jrstPluginVersion>1.4-SNAPSHOT</jrstPluginVersion> + <jrstPluginVersion>1.4</jrstPluginVersion>  @@ -251,24 +261,19 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.4-SNAPSHOT</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> - - + + <plugin> - - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + </plugin> - - - - </plugins> </pluginManagement> @@ -284,89 +289,45 @@ <execution> <goals> <goal>parserJava</goal> - </goals> - </execution> - <execution> - <id>scan-jsp-sources</id> - <goals> - <goal>parserJsp</goal> - </goals> - <configuration> - <userRulesFiles> - <file>${basedir}/src/main/i18n/jsp.rules</file> - </userRulesFiles> - <namespaces> - <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> - <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd - </sx> - <sj>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd - </sj> - <jsp>http://java.sun.com/JSP/Page</jsp> - </namespaces> - </configuration> - </execution> - <execution> - <id>gen-and-make-bundle</id> - <goals> <goal>gen</goal> <goal>bundle</goal> </goals> </execution> </executions> - + </plugin> - - - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <configuration> - <webAppConfig> - <contextPath>/${project.artifactId}</contextPath> - </webAppConfig> - - - </configuration> - </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <configuration> + <webAppConfig> + <contextPath>/${project.artifactId}</contextPath> + </webAppConfig> +  + </configuration> + </plugin> + + </plugins> </build>  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk + <connection> + scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk </connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk </developerConnection> <url>http://www.nuiton.org/repositories/browse/scmwebeditor/trunk</url> </scm> - <profiles> - -  - <profile> - <id>release-assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - - <plugins> - - - </plugins> - </build> - </profile> - </profiles> - </project>

1 0