Menu
▾
▴
itracker-commits — itracker CVS commits are distributed through this mailinglist. Join to develop.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(217) |
Nov
(180) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(58) |
Feb
(370) |
Mar
(105) |
Apr
(165) |
May
(93) |
Jun
(37) |
Jul
|
Aug
(21) |
Sep
(131) |
Oct
(40) |
Nov
(113) |
Dec
(401) |
| 2007 |
Jan
(180) |
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2008 |
Jan
(163) |
Feb
(78) |
Mar
|
Apr
(4) |
May
(28) |
Jun
(2) |
Jul
|
Aug
|
Sep
(96) |
Oct
(189) |
Nov
(413) |
Dec
(121) |
| 2009 |
Jan
(34) |
Feb
(18) |
Mar
(24) |
Apr
(16) |
May
(3) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(13) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(3) |
Oct
(16) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
(35) |
Jun
|
Jul
(17) |
Aug
(7) |
Sep
|
Oct
(9) |
Nov
|
Dec
|
|
From: <ra...@us...> - 2012-10-16 12:57:27
|
Revision: 2328
http://itracker.svn.sourceforge.net/itracker/?rev=2328&view=rev
Author: ranks
Date: 2012-10-16 12:57:18 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
quickfix for new version from Maven build, remove the -SNAPSHOT suffix if present to avoid stack-trace in logs
Modified Paths:
--------------
itracker/trunk/src/main/java/org/itracker/services/util/SystemConfigurationUtilities.java
Modified: itracker/trunk/src/main/java/org/itracker/services/util/SystemConfigurationUtilities.java
===================================================================
--- itracker/trunk/src/main/java/org/itracker/services/util/SystemConfigurationUtilities.java 2012-10-16 12:56:05 UTC (rev 2327)
+++ itracker/trunk/src/main/java/org/itracker/services/util/SystemConfigurationUtilities.java 2012-10-16 12:57:18 UTC (rev 2328)
@@ -123,6 +123,8 @@
log.debug("getVersionAsLong: transforming " + version);
}
if (version != null) {
+ // support -SNAPSHOT versions
+ version = version.split("-")[0];
StringTokenizer token = new StringTokenizer(version, ".");
try {
if (token.countTokens() > 0 && token.countTokens() <= 3) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-10-16 12:56:15
|
Revision: 2327
http://itracker.svn.sourceforge.net/itracker/?rev=2327&view=rev
Author: ranks
Date: 2012-10-16 12:56:05 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
fixing selenium tests on forgot-password moved to tiles
Modified Paths:
--------------
itracker/trunk/src/test/java/org/itracker/selenium/ForgotPasswordTest.java
Modified: itracker/trunk/src/test/java/org/itracker/selenium/ForgotPasswordTest.java
===================================================================
--- itracker/trunk/src/test/java/org/itracker/selenium/ForgotPasswordTest.java 2012-10-16 12:36:01 UTC (rev 2326)
+++ itracker/trunk/src/test/java/org/itracker/selenium/ForgotPasswordTest.java 2012-10-16 12:56:05 UTC (rev 2327)
@@ -39,7 +39,7 @@
selenium.waitForPageToLoad(SE_TIMEOUT);
assertEquals("Login is required\n Last Name is required",
- selenium.getText("//span[@class='formError']"));
+ selenium.getText("//div[@class='formError']"));
}
/**
@@ -65,7 +65,7 @@
selenium.click("//input[@type='submit']");
selenium.waitForPageToLoad(SE_TIMEOUT);
- assertEquals("Login is required", selenium.getText("//span[@class='formError']"));
+ assertEquals("Login is required", selenium.getText("//div[@class='formError']"));
}
/**
@@ -88,7 +88,7 @@
selenium.click("//input[@type='submit']");
selenium.waitForPageToLoad(SE_TIMEOUT);
- assertEquals("Last Name is required", selenium.getText("//span[@class='formError']"));
+ assertEquals("Last Name is required", selenium.getText("//div[@class='formError']"));
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-10-16 12:36:12
|
Revision: 2326
http://itracker.svn.sourceforge.net/itracker/?rev=2326&view=rev
Author: ranks
Date: 2012-10-16 12:36:01 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
new SCM connection from project migration, failsafe plugin added for integration testing, jetty version increased, fixed, todo..
Modified Paths:
--------------
itracker/trunk/pom.xml
Modified: itracker/trunk/pom.xml
===================================================================
--- itracker/trunk/pom.xml 2012-10-16 12:28:29 UTC (rev 2325)
+++ itracker/trunk/pom.xml 2012-10-16 12:36:01 UTC (rev 2326)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
<groupId>org.itracker</groupId>
<artifactId>itracker</artifactId>
@@ -25,12 +26,12 @@
<bsh.version>1.3.0</bsh.version>
<mysql-connector-java.version>5.1.6</mysql-connector-java.version>
- <hsqldb.version>1.8.0.10</hsqldb.version>
+ <hsqldb.version>1.8.0.10</hsqldb.version>
<postgresql.version>9.1-901-1.jdbc4</postgresql.version>
<derby.version>10.9.1.0</derby.version>
<mail.version>1.4.4</mail.version>
<c3p0.version>0.9.1.2</c3p0.version>
-
+
<maven-findbugs-plugin.version>2.4.0</maven-findbugs-plugin.version>
<maven-site-plugin.version>3.0</maven-site-plugin.version>
<maven-project-info-reports-plugin.version>2.4</maven-project-info-reports-plugin.version>
@@ -38,26 +39,27 @@
<maven-clover-plugin.version>3.7</maven-clover-plugin.version>
<maven-pmd-plugin.version>2.7.1</maven-pmd-plugin.version>
<maven-checkstyle-plugin.version>2.8</maven-checkstyle-plugin.version>
- <maven-jetty-plugin.version>8.1.3.v20120416</maven-jetty-plugin.version>
+ <maven-jetty-plugin.version>8.1.7.v20120910</maven-jetty-plugin.version>
<maven-taglist-plugin.version>2.4</maven-taglist-plugin.version>
<maven-jxr-plugin.version>2.3</maven-jxr-plugin.version>
<maven-changes-plugin.version>2.7</maven-changes-plugin.version>
<maven-changelog-plugin.version>2.2</maven-changelog-plugin.version>
<maven-surefire-report-plugin.version>2.12</maven-surefire-report-plugin.version>
+ <maven-failsafe-plugin.version>2.12.3</maven-failsafe-plugin.version>
<maven-cobertura-plugin.version>2.5.1</maven-cobertura-plugin.version>
<maven-javadoc-plugin.version>2.8.1</maven-javadoc-plugin.version>
<maven-war-plugin.version>2.1.1</maven-war-plugin.version>
<maven-compiler-plugin.version>2.0.2</maven-compiler-plugin.version>
<maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
<maven-wagon-ssh-plugin.version>2.2</maven-wagon-ssh-plugin.version>
-
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.outputEncoding>UTF-8</project.build.outputEncoding>
</properties>
<issueManagement>
<system>SourceForge</system>
- <url>http://sourceforge.net/tracker2/?group_id=54141</url>
+ <url>https://sourceforge.net/apps/trac/itracker/</url>
</issueManagement>
<inceptionYear>2002</inceptionYear>
<mailingLists>
@@ -114,10 +116,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://itracker.svn.sourceforge.net/svnroot/itracker/itracker/trunk/</connection>
- <developerConnection>scm:svn:https://itracker.svn.sourceforge.net/svnroot/itracker/itracker/trunk/
- </developerConnection>
- <url>https://itracker.svn.sourceforge.net/svnroot/%69tracker/itracker/trunk/</url>
+ <connection>scm:svn:http://svn.code.sf.net/p/itracker/code/itracker/trunk/</connection>
+ <developerConnection>scm:svn:https://itracker.svn.sourceforge.net/svnroot/itracker/itracker/trunk/</developerConnection>
+ <url>http://svn.code.sf.net/p/itracker/code/itracker/trunk/</url>
</scm>
<organization>
<name>itracker</name>
@@ -195,24 +196,26 @@
</includes>
</configuration>
</execution>
- <!--execution>
- <id>integration-testing</id>
- <phase>integration-test</phase>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.12</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
<goals>
- <goal>test</goal>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
- <configuration>
- <skip>${itracker.it.skip}</skip>
- <excludes>
- <exclude>org/itracker/selenium/**/*.java</exclude>
- <exclude>org/itracker/**/*Test.java</exclude>
- </excludes>
- <includes>
- <include>org/itracker/**/*IT.java</include>
- </includes>
- </configuration>
- </execution-->
+ </execution>
</executions>
+ <configuration>
+ <skipTests>${itracker.it.skip}</skipTests>
+ <skipITs>true</skipITs>
+ <!--forkMode>none</forkMode-->
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -229,7 +232,7 @@
</executions>
<configuration>
<skipTests>${itracker.it.skip}</skipTests>
- <skipTs>true</skipTs>
+ <skipITs>true</skipITs>
<!--forkMode>none</forkMode-->
</configuration>
</plugin>
@@ -237,7 +240,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>${maven-cobertura-plugin.version}</version>
- <executions>
+ <executions>
<execution>
<id>cobertura-clean</id>
<phase>clean</phase>
@@ -266,29 +269,9 @@
<exclude>org/itracker/**/*IT.java</exclude>
</excludes>
</instrumentation>
- <check />
+ <check></check>
</configuration>
</plugin>
- <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-it-maven-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <formats>
- <format>html</format>
- </formats>
- <check>
- <haltOnFailure>false</haltOnFailure>
- </check>
- <instrumentation>
- <excludes>
- <exclude>org/itracker/**/*Test.java</exclude>
- <exclude>org/itracker/**/*IT.java</exclude>
- <exclude>org/itracker/web/**/*.java</exclude>
- </excludes>
- </instrumentation>
- </configuration>
- </plugin-->
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
@@ -297,6 +280,33 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${maven-jetty-plugin.version}</version>
+ <configuration>
+
+ <stopPort>9966</stopPort>
+ <stopKey>foo</stopKey>
+ <webAppConfig>
+ <contextPath>/${application.path}</contextPath>
+ </webAppConfig>
+ <systemProperties>
+ <!--java.naming.factory.initial=org.mortbay.naming.InitialContextFactory-->
+ <systemProperty>
+ <name>java.naming.factory.initial</name>
+ <value>org.eclipse.jetty.jndi.InitialContextFactory</value>
+ </systemProperty>
+ <systemProperty>
+ <name>java.naming.provider.url</name>
+ <value>rmi://localhost:8099</value>
+ </systemProperty>
+ </systemProperties>
+ <daemon>true</daemon>
+ <jettyXml>${project.build.testOutputDirectory}/jetty-env.xconf</jettyXml>
+ <connectors>
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>${application.port}</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -399,6 +409,35 @@
</plugin>
<plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-report-plugin.version}</version>
+ <configuration>
+ <skip>false</skip>
+ <excludes>
+ <exclude>org/itracker/selenium/**/*.java</exclude>
+ <exclude>org/itracker/**/*IT.java</exclude>
+ </excludes>
+ <includes>
+ <include>org/itracker/**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin.version}</version>
+ <configuration>
+ <systemPropertyVariables>
+ <!--<port>${port}</port>-->
+ </systemPropertyVariables>
+ <skip>${itracker.it.skip}</skip>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.testOutputDirectory}</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>${maven-cobertura-plugin.version}</version>
@@ -452,6 +491,15 @@
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>${maven-cobertura-plugin.version}</version>
+ <configuration>
+ <!--dependencyLocationsEnabled>false</dependencyLocationsEnabled-->
+ </configuration>
+ </plugin>
+
+ <plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>${maven-pmd-plugin.version}</version>
<configuration>
@@ -503,7 +551,7 @@
</plugin>
</reportPlugins>
</configuration>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
@@ -542,6 +590,20 @@
<configuration>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
+ <version>${maven-tomcat-plugin.version}</version>
+ <configuration>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -937,14 +999,10 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changelog-maven-plugin</artifactId>
+ <artifactId>maven-changelog-plugin</artifactId>
<version>${maven-changelog-plugin.version}</version>
<configuration>
<type>range</type>
- <ranges>
- <range>300</range>
- </ranges>
</configuration>
</plugin>
<plugin>
@@ -1001,7 +1059,7 @@
<mail.from>itr...@ex...</mail.from>
<mail.transport.protocol.rfc822>smtps</mail.transport.protocol.rfc822>
<mail.smtp.starttls.enable>true</mail.smtp.starttls.enable>
- <!-- additional setttings -->
+ <!-- additional settings -->
<!--main.dataSource.jdbcUrl>jdbc:hsqldb:file:itrackerdev-tomcat;create=true;hsqldb.cache_rows=10000;hsqldb.nio_data_file=false</main.dataSource.jdbcUrl-->
<!--main.dataSource.jdbcUrl>${test.dataSource.jdbcUrl}</main.dataSource.jdbcUrl-->
<!--main.dataSource.user>${test.dataSource.user}</main.dataSource.user>
@@ -1136,184 +1194,6 @@
</build>
</profile>
<profile>
- <id>developer.env</id>
- <properties>
- <itracker.it.skip>true</itracker.it.skip>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <reportPlugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- <version>${maven-clover-plugin.version}</version>
- <configuration>
- <!--[WARNING] No Clover instrumentation done on source files as no matching sources files found-->
-
- <includes>
- <include>org/itracker/**/*.java</include>
- </includes>
- <excludes>
- <exclude>**/*Test.java</exclude>
- <exclude>**/*IT.java</exclude>
- </excludes>
- <generateXml>true</generateXml>
- <includesTestSourceRoots>true</includesTestSourceRoots>
- <includesAllSourceRoots>true</includesAllSourceRoots>
- <contextFilters>static, logIsDebugEnabled, logDebug</contextFilters>
- <licenseLocation>${itracker.clover.license}</licenseLocation>
- <jdk>1.5</jdk>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${maven-project-info-reports-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${maven-pmd-plugin.version}</version>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>${maven-jxr-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-changelog-plugin</artifactId>
- <version>${maven-changelog-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-changes-plugin</artifactId>
- <version>${maven-changes-plugin.version}</version>
- <configuration>
- <type>range</type>
- <range>
- 300
- </range>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${maven-surefire-report-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin.version}</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>${maven-taglist-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${maven-findbugs-plugin.version}</version>
-
- <configuration>
- <xmlOutput>false</xmlOutput>
- <xmlOutputDirectory>findbugs</xmlOutputDirectory>
- <threshold>Normal</threshold>
- <effort>Default</effort>
- </configuration>
- </plugin>
- </reportPlugins>
-
- </configuration>
- </plugin>
-
-
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- <version>${maven-clover-plugin.version}</version>
- <configuration>
- <jdk>1.5</jdk>
-
- <includes>
- <include>org/itracker/**/*.java</include>
- </includes>
- <excludes>
- <exclude>**/*Test.java</exclude>
- <exclude>**/*IT.java</exclude>
- </excludes>
- <generateXml>true</generateXml>
- <includesTestSourceRoots>true</includesTestSourceRoots>
- <includesAllSourceRoots>true</includesAllSourceRoots>
- <useSurefireTestResults>true</useSurefireTestResults>
-
- <contextFilters>static, logIsDebugEnabled, logDebug</contextFilters>
- <licenseLocation>${itracker.clover.license}</licenseLocation>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- <executions>
- <execution>
- <phase>pre-site</phase>
- <goals>
- <goal>instrument</goal>
- </goals>
- <configuration>
- </configuration>
- </execution>
- </executions>
-
- </plugin>
- </plugins>
-
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- <version>${maven-clover-plugin.version}</version>
- <configuration>
- <jdk>1.5</jdk>
- <includes>
- <include>org/itracker/**/*.java</include>
- </includes>
- <excludes>
- <exclude>**/*Test.java</exclude>
- <exclude>**/*IT.java</exclude>
- </excludes>
- <generateXml>true</generateXml>
- <includesTestSourceRoots>true</includesTestSourceRoots>
- <includesAllSourceRoots>true</includesAllSourceRoots>
- <useSurefireTestResults>true</useSurefireTestResults>
-
- <contextFilters>static, logIsDebugEnabled, logDebug</contextFilters>
- <licenseLocation>${itracker.clover.license}</licenseLocation>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- <profile>
<id>selenium</id>
<properties>
@@ -1338,37 +1218,19 @@
<test.dataSource.driverClass>org.hsqldb.jdbcDriver</test.dataSource.driverClass>
<test.hibernate.dialect>org.hibernate.dialect.HSQLDialect</test.hibernate.dialect>
</properties>
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-plus</artifactId>
- <version>${maven-jetty-plugin.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <!--repositories>
+ <repositories>
<repository>
<id>mortbay-repo</id>
<name>mortbay-repo</name>
<url>http://www.mortbay.org/maven2/release</url>
</repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>mortbay-repo</id>
- <name>mortbay-repo</name>
- <url>http://www.mortbay.org/maven2/snapshot</url>
- </pluginRepository>
- </pluginRepositories-->
+
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
<executions>
<execution>
<id>hsql-server-start</id>
@@ -1422,7 +1284,8 @@
</goals>
<configuration>
<tasks>
- <copy overwrite="true" file="${project.build.testOutputDirectory}/log4j.xml" todir="${project.build.testOutputDirectory}/" />
+ <copy overwrite="true" file="${project.build.testOutputDirectory}/log4j.xml"
+ todir="${project.build.testOutputDirectory}/" />
</tasks>
</configuration>
</execution>
@@ -1495,10 +1358,10 @@
</systemProperties>
<useProvidedScope>false</useProvidedScope>
<daemon>true</daemon>
- <webApp>
+ <webAppConfig>
<contextPath>/${application.path}</contextPath>
<jettyEnvXml>${project.build.testOutputDirectory}/jetty-env.xconf</jettyEnvXml>
- </webApp>
+ </webAppConfig>
<jettyXml>${project.build.testOutputDirectory}/jetty.xconf</jettyXml>
<connectors>
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
@@ -1596,7 +1459,7 @@
<exclude>org/itracker/selenium/**/*PreTest.java</exclude>
<!--exclude>org/itracker/**/NamingUtilitiesIT.java</exclude-->
</excludes>
- <forkMode>none</forkMode>
+ <forkMode>none</forkMode>
</configuration>
</execution>
@@ -1608,7 +1471,7 @@
</goals>
<configuration>
<skipTests>false</skipTests>
- <skipTs>false</skipTs>
+ <skipITs>false</skipITs>
<properties>
<itracker.it.skip>true</itracker.it.skip>
</properties>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-10-16 12:28:39
|
Revision: 2325
http://itracker.svn.sourceforge.net/itracker/?rev=2325&view=rev
Author: ranks
Date: 2012-10-16 12:28:29 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
help module moved to use tiles, jsp/html cleanup
Modified Paths:
--------------
itracker/trunk/src/main/webapp/WEB-INF/config/struts-module-help-config.xml
itracker/trunk/src/main/webapp/module-help/help_about.jsp
itracker/trunk/src/main/webapp/module-help/help_common_tasks.jsp
itracker/trunk/src/main/webapp/module-help/help_common_tasks_de.jsp
itracker/trunk/src/main/webapp/module-help/help_common_tasks_ru.jsp
itracker/trunk/src/main/webapp/module-help/show_help.jsp
Added Paths:
-----------
itracker/trunk/src/main/webapp/WEB-INF/config/tiles-defs-help.xml
Modified: itracker/trunk/src/main/webapp/WEB-INF/config/struts-module-help-config.xml
===================================================================
--- itracker/trunk/src/main/webapp/WEB-INF/config/struts-module-help-config.xml 2012-10-16 12:25:40 UTC (rev 2324)
+++ itracker/trunk/src/main/webapp/WEB-INF/config/struts-module-help-config.xml 2012-10-16 12:28:29 UTC (rev 2325)
@@ -35,14 +35,26 @@
<!-- ==================================== Action Mappings -->
<action-mappings>
<action path="/show_help" type="org.itracker.web.actions.ShowHelpAction">
- <forward module="/module-help" name="show_help" path="/show_help.jsp"/>
+ <forward module="/module-help" name="show_help" path="t.show_help"/>
</action>
</action-mappings>
+ <!-- ==================================== Controllers -->
+ <controller processorClass="org.apache.struts.tiles.TilesRequestProcessor">
+ <set-property property="inputForward" value="false"/>
+ </controller>
+
+ <!-- ==================================== Plug-ins -->
<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
<set-property property="pathnames"
- value="/WEB-INF/config/validator-rules.xml,
+ value="/WEB-INF/config/validator-rules.xml,
/WEB-INF/config/validation-module-help.xml"/>
</plug-in>
+ <plug-in className="org.apache.struts.tiles.TilesPlugin">
+ <set-property
+ property="definitions-config"
+ value="/WEB-INF/config/tiles-defs.xml, /WEB-INF/config/tiles-defs-help.xml"/>
+ <set-property property="moduleAware" value="true"/>
+ </plug-in>
</struts-config>
Copied: itracker/trunk/src/main/webapp/WEB-INF/config/tiles-defs-help.xml (from rev 2295, itracker/trunk/src/main/webapp/WEB-INF/config/tiles-defs-search-issues.xml)
===================================================================
--- itracker/trunk/src/main/webapp/WEB-INF/config/tiles-defs-help.xml (rev 0)
+++ itracker/trunk/src/main/webapp/WEB-INF/config/tiles-defs-help.xml 2012-10-16 12:28:29 UTC (rev 2325)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration 1.3//EN"
+ "http://struts.apache.org/dtds/tiles-config_1_3.dtd">
+
+<tiles-definitions>
+ <!-- search -->
+ <definition name="t.show_help" extends="mainLayout">
+ <put name="body" value="/module-help/show_help.jsp"/>
+ </definition>
+</tiles-definitions>
\ No newline at end of file
Modified: itracker/trunk/src/main/webapp/module-help/help_about.jsp
===================================================================
--- itracker/trunk/src/main/webapp/module-help/help_about.jsp 2012-10-16 12:25:40 UTC (rev 2324)
+++ itracker/trunk/src/main/webapp/module-help/help_about.jsp 2012-10-16 12:28:29 UTC (rev 2325)
@@ -1,29 +1,23 @@
-<%@ include file="/common/taglibs.jsp"%>
+<%@ include file="/common/taglibs.jsp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<center><span class="pageHeader"><u><it:message key="itracker.web.helpabout.title"/></u></span></center>
-<br/>
-<br/>
+
<p class="help">
- <b><it:message key="itracker.web.helpabout.itrackerversion"/>:</b> <bean:write name="version"/><br/>
- <b><it:message key="itracker.web.helpabout.starttime"/>:</b> <bean:write name="starttime"/><br/>
- <b><it:message key="itracker.web.helpabout.defaultlocale"/>:</b> <it:message key="itracker.locale.name"/><br/>
- <br/>
+ <b><it:message key="itracker.web.helpabout.itrackerversion"/>:</b> <bean:write name="version"/><br/>
+ <b><it:message key="itracker.web.helpabout.starttime"/>:</b> <bean:write name="starttime"/><br/>
+ <b><it:message key="itracker.web.helpabout.defaultlocale"/>:</b> <it:message key="itracker.locale.name"/><br/>
+ <br/>
- <b><it:message key="itracker.web.helpabout.javaversion"/>:</b> <bean:write name="javaVersion" scope="request"/>, <bean:write name="javaVendor" scope="request"/><br/>
- <br/>
+ <b><it:message key="itracker.web.helpabout.javaversion"/>:</b> <bean:write name="javaVersion" scope="request"/>,
+ <bean:write name="javaVendor" scope="request"/><br/>
+ <br/>
</p>
<br/><br/>
-<table cellspacing="0" cellspacing="1" border="0" width="100%" class="help">
- <tr>
- <td><b><it:message key="itracker.web.helpabout.createdby"/>:</b></td>
- <td align="left">Initial Code Donation: Jason Carroll (<a href="mailto:jca...@co...">jca...@co...</a>), and the itracker developer community...</td>
- </tr>
- <tr>
- <td></td>
- <td align="left"><it:message key="itracker.web.attr.copyright"/> 2002, 2003, 2004 by <a href="mailto:jca...@co...">Jason Carroll</a>, donated it to public domain,
- 2005 by <a href="http://www.itracker.org" target="_blank">itracker.org Version
- 3.0, licensed under LGPL.</a></td>
- </tr>
+<table cellspacing="0" cellspacing="1" border="0" width="100%" class="help">
+ <tr>
+ <td><b><it:message key="itracker.web.helpabout.createdby"/>:</b></td>
+ <td align="left">Initial Code Donation: Jason Carroll (<a href="mailto:jca...@co...">jca...@co...</a>),
+ and the itracker developer community...
+ </td>
+ </tr>
</table>
Modified: itracker/trunk/src/main/webapp/module-help/help_common_tasks.jsp
===================================================================
--- itracker/trunk/src/main/webapp/module-help/help_common_tasks.jsp 2012-10-16 12:25:40 UTC (rev 2324)
+++ itracker/trunk/src/main/webapp/module-help/help_common_tasks.jsp 2012-10-16 12:28:29 UTC (rev 2325)
@@ -1,101 +1,113 @@
-<%@ include file="/common/taglibs.jsp"%>
+<%@ include file="/common/taglibs.jsp" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<a name="top"></a><span class="pageHeader">Common Tasks</span><br/>
<ul>
- <li><a href="#create">Creating an Issue</a></li>
- <li><a href="#edit">Editing an Issue</a></li>
- <li><a href="#list">Listing Issues</a></li>
- <li><a href="#search">Searching for Issues</a></li>
- <li><a href="#report">Running Reports</a></li>
- <li><a href="#prefs">Editing Preferences</a></li>
+ <li><a href="#create">Creating an Issue</a></li>
+ <li><a href="#edit">Editing an Issue</a></li>
+ <li><a href="#list">Listing Issues</a></li>
+ <li><a href="#search">Searching for Issues</a></li>
+ <li><a href="#report">Running Reports</a></li>
+ <li><a href="#prefs">Editing Preferences</a></li>
</ul>
-<center><hr width="75%" noshade height="1"/></center>
+<hr width="75%" noshade height="1"/>
<a name="create"></a><span class="editColumnTitle">Creating an Issue</span> <a href="#top" class="headerLinks">[top]</a><br/>
+
<p class="help">
-To create a new issue, first go to the project list screen by clicking "Project List"
-in the top menu. From this screen you can click on create new issue icon
-(<html:img styleClass="helpImage" src="../themes/defaulttheme/images/create.gif"/>) beside the project you want to create
-the issue for.<br/>
-<br/>
-You must have "create" permission in a project before you can create a new issue
-for that project.<br/>
+ To create a new issue, first go to the project list screen by clicking "Project List"
+ in the top menu. From this screen you can click on create new issue icon
+ (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/create.gif"/>) beside the project you want to
+ create
+ the issue for.<br/>
+ <br/>
+ You must have "create" permission in a project before you can create a new issue
+ for that project.<br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
-<a name="edit"></a><span class="editColumnTitle">Editing an Issue</span> <a href="#top" class="headerLinks">[top]</a><br/>
+<hr width="75%" noshade height="1"/>
+<a name="edit"></a><span class="editColumnTitle">Editing an Issue</span> <a href="#top"
+ class="headerLinks">[top]</a><br/>
+
<p class="help">
-There are a couple ways to edit an existing issue.<br/>
-<br/>
-If the issue is visible on your myITracker page, you can click the edit
-(<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) icon beside the issue you wish to edit.<br/>
-<br/>
-If you are currently viewing the details of an issue, the edit icon
-(<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) will be displayed in actions area.<br/>
-<br/>
-To edit an existing issue, first go to the project list screen by clicking "Project List"
-in the top menu. From this screen you can click the view project issues icon
-(<html:img styleClass="helpImage" src="../themes/defaulttheme/images/view.gif"/>) beside the project you want a list
-of issues for. Once you have a list of issues, you can select the edit icon
-(<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) beside the issue you wish to edit.<br/>
-<br/>
-You must have edit permissions for a project before you can edit an existing issue
-for a project.<br/>
+ There are a couple ways to edit an existing issue.<br/>
+ <br/>
+ If the issue is visible on your myITracker page, you can click the edit
+ (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) icon beside the issue you wish to
+ edit.<br/>
+ <br/>
+ If you are currently viewing the details of an issue, the edit icon
+ (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) will be displayed in actions area.<br/>
+ <br/>
+ To edit an existing issue, first go to the project list screen by clicking "Project List"
+ in the top menu. From this screen you can click the view project issues icon
+ (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/view.gif"/>) beside the project you want a list
+ of issues for. Once you have a list of issues, you can select the edit icon
+ (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) beside the issue you wish to edit.<br/>
+ <br/>
+ You must have edit permissions for a project before you can edit an existing issue
+ for a project.<br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
+<hr width="75%" noshade height="1"/>
<a name="list"></a><span class="editColumnTitle">Listing Issues</span> <a href="#top" class="headerLinks">[top]</a><br/>
+
<p class="help">
-To list the issues for a project, first go to the project list screen by clicking
-"Project List" in the top menu. From this screen you can click the view project
-issues icon (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/view.gif"/>) beside the
-project you want a list of issues for. From this screen you can view the details of the
-issue, watch the issue if you aren't already being notified of changes, or edit the issue
-if you have permissions.<br/>
+ To list the issues for a project, first go to the project list screen by clicking
+ "Project List" in the top menu. From this screen you can click the view project
+ issues icon (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/view.gif"/>) beside the
+ project you want a list of issues for. From this screen you can view the details of the
+ issue, watch the issue if you aren't already being notified of changes, or edit the issue
+ if you have permissions.<br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
-<a name="search"></a><span class="editColumnTitle">Searching for Issues</span> <a href="#top" class="headerLinks">[top]</a><br/>
+<hr width="75%" noshade height="1"/>
+<a name="search"></a><span class="editColumnTitle">Searching for Issues</span> <a href="#top"
+ class="headerLinks">[top]</a><br/>
+
<p class="help">
-This lets you search for issues across projects based on their severity and status codes.
-From the search page you can select multiple values by holding the Ctrl key while you select
-the values from the list, or you can select a range by clicking the first value you want,
-and then holding down Shift while you select the second value. Once you have your search
-and sort criteria specified, just click Search to find all the matches.
-<br/>
-You can also perform a more detailed search within a particular project by clicking on the
-Project Issue search icon (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/search.gif"/>) beside
-the project on the Project List page.
-<br/>
-From the results section you can edit or view the issues if you have permission to do so,
-by clicking on the appropriate icon.
-<br/>
+ This lets you search for issues across projects based on their severity and status codes.
+ From the search page you can select multiple values by holding the Ctrl key while you select
+ the values from the list, or you can select a range by clicking the first value you want,
+ and then holding down Shift while you select the second value. Once you have your search
+ and sort criteria specified, just click Search to find all the matches.
+ <br/>
+ You can also perform a more detailed search within a particular project by clicking on the
+ Project Issue search icon (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/search.gif"/>) beside
+ the project on the Project List page.
+ <br/>
+ From the results section you can edit or view the issues if you have permission to do so,
+ by clicking on the appropriate icon.
+ <br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
-<a name="report"></a><span class="editColumnTitle">Running Reports</span> <a href="#top" class="headerLinks">[top]</a><br/>
+<hr width="75%" noshade height="1"/>
+<a name="report"></a><span class="editColumnTitle">Running Reports</span> <a href="#top"
+ class="headerLinks">[top]</a><br/>
+
<p class="help">
-To run the reports, first select the checkboxes beside the projects you want included in
-the report. Then select the desired report from the pull-down menu and click the run report
-button. The report will then be processed and the results will be displayed in your current
-browser window. Depending on the number of issues in a project and the number of projects
-selected, a report may take several minutes to run.<br/>
+ To run the reports, first select the checkboxes beside the projects you want included in
+ the report. Then select the desired report from the pull-down menu and click the run report
+ button. The report will then be processed and the results will be displayed in your current
+ browser window. Depending on the number of issues in a project and the number of projects
+ selected, a report may take several minutes to run.<br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
-<a name="prefs"></a><span class="editColumnTitle">Editing Preferences</span> <a href="#top" class="headerLinks">[top]</a><br/>
+<hr width="75%" noshade height="1"/>
+<a name="prefs"></a><span class="editColumnTitle">Editing Preferences</span> <a href="#top"
+ class="headerLinks">[top]</a><br/>
+
<p class="help">
-To edit your preferences, click on the My Preferences Link in the top menu. This
-will take you to a screen that will allow you to change your personal information. You
-can also set some preferences that affect the display of the site.<br/>
-<br/>
-If you allow automatic login, a permanent cookie will be stored on your machine with your
-plaintext user ID and password. This may be a security issue so be sure you want this option
-before you select it.<br/>
-<br/>
-When selecting the number of issues to display on a page, you can display all the issues
-by putting in either 0 or a negative number. Any positive number will paginate the results
-into screens of the selected number of items.<br/>
+ To edit your preferences, click on the My Preferences Link in the top menu. This
+ will take you to a screen that will allow you to change your personal information. You
+ can also set some preferences that affect the display of the site.<br/>
+ <br/>
+ If you allow automatic login, a permanent cookie will be stored on your machine with your
+ plaintext user ID and password. This may be a security issue so be sure you want this option
+ before you select it.<br/>
+ <br/>
+ When selecting the number of issues to display on a page, you can display all the issues
+ by putting in either 0 or a negative number. Any positive number will paginate the results
+ into screens of the selected number of items.<br/>
</p>
Modified: itracker/trunk/src/main/webapp/module-help/help_common_tasks_de.jsp
===================================================================
--- itracker/trunk/src/main/webapp/module-help/help_common_tasks_de.jsp 2012-10-16 12:25:40 UTC (rev 2324)
+++ itracker/trunk/src/main/webapp/module-help/help_common_tasks_de.jsp 2012-10-16 12:28:29 UTC (rev 2325)
@@ -1,108 +1,117 @@
-<%@ include file="/common/taglibs.jsp"%>
+<%@ include file="/common/taglibs.jsp" %>
<%@ page pageEncoding="UTF-8" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<a name="top"></a><span class="pageHeader">Alltägliche Aufgaben</span><br/>
<ul>
- <li><a href="#create">Einen Eintrag anlegen</a></li>
- <li><a href="#edit">Einen Eintrag bearbeiten</a></li>
- <li><a href="#list">Einträge auflisten</a></li>
- <li><a href="#search">Einträge suchen</a></li>
- <li><a href="#report">Reports erzeugen</a></li>
- <li><a href="#prefs">Voreinstellungen bearbeiten</a></li>
+ <li><a href="#create">Einen Eintrag anlegen</a></li>
+ <li><a href="#edit">Einen Eintrag bearbeiten</a></li>
+ <li><a href="#list">Einträge auflisten</a></li>
+ <li><a href="#search">Einträge suchen</a></li>
+ <li><a href="#report">Reports erzeugen</a></li>
+ <li><a href="#prefs">Voreinstellungen bearbeiten</a></li>
</ul>
-<center><hr width="75%" noshade height="1"/></center>
-<a name="create"></a><span class="editColumnTitle">Einen Eintrag anlegen</span> <a href="#top" class="headerLinks">[top]</a><br/>
+<hr width="75%" noshade height="1"/>
+<a name="create"></a><span class="editColumnTitle">Einen Eintrag anlegen</span> <a href="#top"
+ class="headerLinks">[top]</a><br/>
+
<p class="help">
-Um einen neuen Eintrag anzulegen, müssen Sie zuerst die "Projekt Liste" im
-Hauptmenü auswählen. Dort können Sie über den Knopf "Neuer Eintrag"
-(<html:img styleClass="helpImage" src="../themes/defaulttheme/images/create.gif"/>)
-neben dem gewünschten Projekt den Eintrag erstellen.<br/>
-<br/>
-Sie müssen dabei die Rechte haben, in dem Projekt neue Einträge anlegen zu können.
-<br/>
+ Um einen neuen Eintrag anzulegen, müssen Sie zuerst die "Projekt Liste" im
+ Hauptmenü auswählen. Dort können Sie über den Knopf "Neuer Eintrag"
+ (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/create.gif"/>)
+ neben dem gewünschten Projekt den Eintrag erstellen.<br/>
+ <br/>
+ Sie müssen dabei die Rechte haben, in dem Projekt neue Einträge anlegen zu können.
+ <br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
+<hr width="75%" noshade height="1"/>
<a name="edit"></a><span class="editColumnTitle">Einen Eintrag bearbeiten</span> <a href="#top" class="headerLinks">[top]</a><br/>
+
<p class="help">
-Es gibt mehrere Wege, einen bestehenden Eintrag zu bearbeiten.<br/>
-<br/>
-Ist der Eintrag auf der myITracker Seite sichtbar, können Sie auf den "Bearbeiten" Knopf
-(<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) neben dem
-Eintrag klicken.<br/>
-<br/>
-Wenn Sie sich gerade die Details eines Eintrags ansehen, wird der "Bearbeiten" Knopf
-(<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) auf der Seite angzeigt.<br/>
-<br/>
-Um einen beliebigen Eintrag zu bearbeiten, können Sie zuerst die "Projekt Liste"
-im Hauptmenü anwählen. Von da aus können Sie den "Einträge ansehen" Knopf
-(<html:img styleClass="helpImage" src="../themes/defaulttheme/images/view.gif"/>)
-neben dem gewünschten Projekt betätigen, um eine Liste der Einträge zu erhalten.
-In dieser Liste können Sie dann neben dem gewünschten Eintrag auf den
-"Bearbeiten" Knopf (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) klicken.<br/>
-<br/>
-Sie müssen dabei die Rechte haben, in dem Projekt bestehende Einträge bearbeiten zu dürfen.<br/>
+ Es gibt mehrere Wege, einen bestehenden Eintrag zu bearbeiten.<br/>
+ <br/>
+ Ist der Eintrag auf der myITracker Seite sichtbar, können Sie auf den "Bearbeiten" Knopf
+ (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) neben dem
+ Eintrag klicken.<br/>
+ <br/>
+ Wenn Sie sich gerade die Details eines Eintrags ansehen, wird der "Bearbeiten" Knopf
+ (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) auf der Seite angzeigt.<br/>
+ <br/>
+ Um einen beliebigen Eintrag zu bearbeiten, können Sie zuerst die "Projekt Liste"
+ im Hauptmenü anwählen. Von da aus können Sie den "Einträge ansehen" Knopf
+ (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/view.gif"/>)
+ neben dem gewünschten Projekt betätigen, um eine Liste der Einträge zu erhalten.
+ In dieser Liste können Sie dann neben dem gewünschten Eintrag auf den
+ "Bearbeiten" Knopf (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) klicken.<br/>
+ <br/>
+ Sie müssen dabei die Rechte haben, in dem Projekt bestehende Einträge bearbeiten zu dürfen.<br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
-<a name="list"></a><span class="editColumnTitle">Einträge auflisten</span> <a href="#top" class="headerLinks">[top]</a><br/>
+<hr width="75%" noshade height="1"/>
+<a name="list"></a><span class="editColumnTitle">Einträge auflisten</span> <a href="#top"
+ class="headerLinks">[top]</a><br/>
+
<p class="help">
-Um die Einträge für ein Projekt aufzulisten, müssen Sie zuerst die "Projekt Liste"
-im Hauptmenü anwählen. Von dieser Liste aus können Sie den "Einträge ansehen" Knopf
-(<html:img styleClass="helpImage" src="../themes/defaulttheme/images/view.gif"/>)
-neben dem gewünschten Projekt betätigen, um eine Liste der Einträge zu erhalten.
-Von dieser Liste aus, können Sie die Details eines Eintrags ansehen, auswählen, dass Sie
-an dem Eintrag interessiert sind (nur falls Sie noch keine Benachrichtigungs E-Mails für
-diesen Eintrag erhalten) oder den Eintrag bearbeiten, wenn Sie über die
-notwendigen Rechte verfügen.<br/>
+ Um die Einträge für ein Projekt aufzulisten, müssen Sie zuerst die "Projekt Liste"
+ im Hauptmenü anwählen. Von dieser Liste aus können Sie den "Einträge ansehen" Knopf
+ (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/view.gif"/>)
+ neben dem gewünschten Projekt betätigen, um eine Liste der Einträge zu erhalten.
+ Von dieser Liste aus, können Sie die Details eines Eintrags ansehen, auswählen, dass Sie
+ an dem Eintrag interessiert sind (nur falls Sie noch keine Benachrichtigungs E-Mails für
+ diesen Eintrag erhalten) oder den Eintrag bearbeiten, wenn Sie über die
+ notwendigen Rechte verfügen.<br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
-<a name="search"></a><span class="editColumnTitle">Einträge suchen</span> <a href="#top" class="headerLinks">[top]</a><br/>
+<hr width="75%" noshade height="1"/>
+<a name="search"></a><span class="editColumnTitle">Einträge suchen</span> <a href="#top"
+ class="headerLinks">[top]</a><br/>
+
<p class="help">
-Hier können Sie Einträge über verschiedene Projekte hinweg suchen. Die Suche kann nach Wichtigkeit
-und Status erfolgen. In der Suchseite können Sie in Auswahlboxen durch Drücken der Ctrl-Taste
-mehrere Werte durch Anklicken auswählen, während über die Betätigung der Shift-Taste während
-des Klickens ein Bereich von Werten ausgewählt wird. Nach dem Sie die Suchparameter eingetragen
-haben, können Sie über den "Suchen" Knopf mit der Suche beginnen.
-<br/>
-Sie können auch eine detailliertere Suche innerhalb eines Projekts durchführen, indem Sie
-den "Suchen" Knopf (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/search.gif"/>)
-eines bestimmten Projekts in der "Projekt Liste" Seite betätigen.
-<br/>
-Von der Liste mit den Suchergebnissen aus können Sie Einträge ansehen oder bearbeiten, sofern
-Sie über die entsprechenden Rechte verfügen.<br/>
+ Hier können Sie Einträge über verschiedene Projekte hinweg suchen. Die Suche kann nach Wichtigkeit
+ und Status erfolgen. In der Suchseite können Sie in Auswahlboxen durch Drücken der Ctrl-Taste
+ mehrere Werte durch Anklicken auswählen, während über die Betätigung der Shift-Taste während
+ des Klickens ein Bereich von Werten ausgewählt wird. Nach dem Sie die Suchparameter eingetragen
+ haben, können Sie über den "Suchen" Knopf mit der Suche beginnen.
+ <br/>
+ Sie können auch eine detailliertere Suche innerhalb eines Projekts durchführen, indem Sie
+ den "Suchen" Knopf (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/search.gif"/>)
+ eines bestimmten Projekts in der "Projekt Liste" Seite betätigen.
+ <br/>
+ Von der Liste mit den Suchergebnissen aus können Sie Einträge ansehen oder bearbeiten, sofern
+ Sie über die entsprechenden Rechte verfügen.<br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
+<hr width="75%" noshade height="1"/>
<a name="report"></a><span class="editColumnTitle">Reports Erstellen</span> <a href="#top" class="headerLinks">[top]</a><br/>
+
<p class="help">
-Kreuzen Sie in den Kästchen neben den Projekten diejenigen an, die Sie in dem Report
-enthalten sehen wollen. Danach können Sie den gewünschten Report aus der Checkbox
-auswählen und die Erzeugung über den "Report erstellen" Knopf starten.
-Der Report wird dann erstellt und im aktuellen Browser-Fenster angezeigt. Je nach
-Anzahl der Einträge in den Projekten kann die Erzeugung des Reports mehrere Minuten
-dauern.<br/>
+ Kreuzen Sie in den Kästchen neben den Projekten diejenigen an, die Sie in dem Report
+ enthalten sehen wollen. Danach können Sie den gewünschten Report aus der Checkbox
+ auswählen und die Erzeugung über den "Report erstellen" Knopf starten.
+ Der Report wird dann erstellt und im aktuellen Browser-Fenster angezeigt. Je nach
+ Anzahl der Einträge in den Projekten kann die Erzeugung des Reports mehrere Minuten
+ dauern.<br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
+<hr width="75%" noshade height="1"/>
<a name="prefs"></a><span class="editColumnTitle">Voreinstellungen bearbeiten</span> <a href="#top" class="headerLinks">[top]</a><br/>
+
<p class="help">
-Über den Punkt "Meine Einstellungen" im Haputmenü können Sie ihre Voreinstellungen ändern.
-Auf der Seite mit den Einstellungen können Sie sowohl persönliche Informationen ändern,
-als auch Einstellungen, die die Darstellung von ITracker beeinflussen.<br/>
-<br/>
-Wenn Sie "Login speichern" ausgewählt haben, wird ein permanenter Cookie mit ihrem
-Benutzernamen im Klartext und dem verschlüsselten Password auf Ihrem Rechner gespeichert.
-Dies kann ein
-Sicherheitsrisiko darstellen, wenn andere Personen Zugriff auf Ihren Rechner haben.
-Wählen Sie diesen Punkt also nur aus, wenn Sie sicher sind, dass Sie das wollen.<br/>
-<br/>
-Wenn Sie bei der Anzahl der Einträge, die auf einer Seite angezeigt werden sollen,
-0 oder eine negative Zahl eintragen, können Sie alle Einträge ansehen auf einer Seite
-ansehen. Die Anzeige einer positiven Zahl beschränkt die Anzeige auf diese Anzahl an
-Einträgen pro Seite.<br/>
+ Über den Punkt "Meine Einstellungen" im Haputmenü können Sie ihre Voreinstellungen ändern.
+ Auf der Seite mit den Einstellungen können Sie sowohl persönliche Informationen ändern,
+ als auch Einstellungen, die die Darstellung von ITracker beeinflussen.<br/>
+ <br/>
+ Wenn Sie "Login speichern" ausgewählt haben, wird ein permanenter Cookie mit ihrem
+ Benutzernamen im Klartext und dem verschlüsselten Password auf Ihrem Rechner gespeichert.
+ Dies kann ein
+ Sicherheitsrisiko darstellen, wenn andere Personen Zugriff auf Ihren Rechner haben.
+ Wählen Sie diesen Punkt also nur aus, wenn Sie sicher sind, dass Sie das wollen.<br/>
+ <br/>
+ Wenn Sie bei der Anzahl der Einträge, die auf einer Seite angezeigt werden sollen,
+ 0 oder eine negative Zahl eintragen, können Sie alle Einträge ansehen auf einer Seite
+ ansehen. Die Anzeige einer positiven Zahl beschränkt die Anzeige auf diese Anzahl an
+ Einträgen pro Seite.<br/>
</p>
Modified: itracker/trunk/src/main/webapp/module-help/help_common_tasks_ru.jsp
===================================================================
--- itracker/trunk/src/main/webapp/module-help/help_common_tasks_ru.jsp 2012-10-16 12:25:40 UTC (rev 2324)
+++ itracker/trunk/src/main/webapp/module-help/help_common_tasks_ru.jsp 2012-10-16 12:28:29 UTC (rev 2325)
@@ -1,113 +1,119 @@
-<%@ include file="/common/taglibs.jsp"%>
+<%@ include file="/common/taglibs.jsp" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<a name="top"></a><span class="pageHeader">\xCF\xEE\xE2\xF1\xE5\xE4\xED\xE5\xE2\xED\xFB\xE5 \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xFF</span><br/>
+<a name="top"></a><span class="pageHeader">������������ ��������</span><br/>
<ul>
- <li><a href="#create">\xD1\xEE\xE7\xE4\xE0\xED\xE8\xE5 \xE7\xE0\xE4\xE0\xED\xE8\xFF</a></li>
- <li><a href="#edit">\xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE5 \xE7\xE0\xE4\xE0\xED\xE8\xFF</a></li>
- <li><a href="#list">\xCF\xF0\xEE\xF1\xEC\xEE\xF2\xF0 \xE7\xE0\xE4\xE0\xED\xE8\xE9</a></li>
- <li><a href="#search">\xCF\xEE\xE8\xF1\xEA \xE7\xE0\xE4\xE0\xED\xE8\xE9</a></li>
- <li><a href="#report">\xC3\xE5\xED\xE5\xF0\xE0\xF6\xE8\xFF \xEE\xF2\xF7\xB8\xF2\xEE\xE2</a></li>
- <li><a href="#prefs">\xC8\xE7\xEC\xE5\xED\xE5\xED\xE8\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE5\xEA</a></li>
+ <li><a href="#create">�������� �������</a></li>
+ <li><a href="#edit">�������������� �������</a></li>
+ <li><a href="#list">�������� �������</a></li>
+ <li><a href="#search">����� �������</a></li>
+ <li><a href="#report">��������� �������</a></li>
+ <li><a href="#prefs">��������� ��������</a></li>
</ul>
-<center><hr width="75%" noshade height="1"/></center>
-<a name="create"></a><span class="editColumnTitle">\xD1\xEE\xE7\xE4\xE0\xED\xE8\xE5 \xE7\xE0\xE4\xE0\xED\xE8\xFF</span>
-<a href="#top" class="headerLinks">[\xED\xE0\xE2\xE5\xF0\xF5]</a><br/>
+<hr width="75%" noshade height="1"/>
+<a name="create"></a><span class="editColumnTitle">�������� �������</span>
+<a href="#top" class="headerLinks">[������]</a><br/>
+
<p class="help">
-\xD7\xF2\xEE\xE1\xFB \xF1\xEE\xE7\xE4\xE0\xF2\xFC \xED\xEE\xE2\xEE\xE5 \xE7\xE0\xE4\xE0\xED\xE8\xE5, \xE2\xED\xE0\xF7\xE0\xEB\xE5 \xEF\xE5\xF0\xE5\xE9\xE4\xE8\xF2\xE5 \xED\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xF3 \xD1\xEF\xE8\xF1\xEE\xEA \xEF\xF0\xEE\xE5\xEA\xF2\xEE\xE2, \xF9\xB8\xEB\xEA\xED\xF3\xE2 \xED\xE0
-\xEE\xE4\xED\xEE\xE8\xEC\xE5\xED\xED\xEE\xE9 \xF1\xF1\xFB\xEB\xEA\xE5 \xE2 \xE3\xEE\xEB\xEE\xE2\xED\xEE\xEC \xEC\xE5\xED\xFE. \xC4\xE0\xEB\xE5\xE5 \xF9\xB8\xEB\xEA\xED\xE8\xF2\xE5 \xED\xE0 \xE8\xEA\xEE\xED\xEA\xE5 \xD1\xEE\xE7\xE4\xE0\xF2\xFC \xED\xEE\xE2\xEE\xE5 \xE7\xE0\xE4\xE0\xED\xE8\xE5
-(<html:img styleClass="helpImage" src="../themes/defaulttheme/images/create.gif"/>)
-\xF0\xFF\xE4\xEE\xEC \xF1 \xEF\xF0\xEE\xE5\xEA\xF2\xEE\xEC, \xE4\xEB\xFF \xEA\xEE\xF2\xEE\xF0\xEE\xE3\xEE \xE2\xFB \xF5\xEE\xF2\xE8\xF2\xE5 \xE5\xE3\xEE \xF1\xEE\xE7\xE4\xE0\xF2\xFC.<br/>
-<br/>
-\xC2\xE0\xEC \xED\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xEE \xE8\xEC\xE5\xF2\xFC \xEF\xEE\xEB\xED\xEE\xEC\xEE\xF7\xE8\xE5 \xD1\xEE\xE7\xE4\xE0\xF2\xFC \xE2 \xEF\xF0\xEE\xE5\xEA\xF2\xE5 \xEF\xE5\xF0\xE5\xE4 \xF2\xE5\xEC, \xEA\xE0\xEA \xE2\xFB \xF1\xEC\xEE\xE6\xE5\xF2\xE5 \xF1\xEE\xE7\xE4\xE0\xE2\xE0\xF2\xFC \xE4\xEB\xFF
-\xED\xE5\xE3\xEE \xED\xEE\xE2\xEE\xE5 \xE7\xE0\xE4\xE0\xED\xE8\xE5.<br/>
+ ����� ������� ����� �������, ������� ��������� �� �������� ������ ��������, ������ ��
+ ����������� ������ � �������� ����. ����� ������� �� ������ ������� ����� �������
+ (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/create.gif"/>)
+ ����� � ��������, ��� �������� �� ������ ��� �������.<br/>
+ <br/>
+ ��� ���������� ����� ���������� ������� � ������� ����� ���, ��� �� ������� ��������� ���
+ ���� ����� �������.<br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
-<a name="edit"></a><span class="editColumnTitle">\xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE5 \xE7\xE0\xE4\xE0\xED\xE8\xFF</span>
-<a href="#top" class="headerLinks">[\xED\xE0\xE2\xE5\xF0\xF5]</a><br/>
+<hr width="75%" noshade height="1"/>
+<a name="edit"></a><span class="editColumnTitle">�������������� �������</span>
+<a href="#top" class="headerLinks">[������]</a><br/>
+
<p class="help">
-\xC5\xF1\xF2\xFC \xED\xE5\xF1\xEA\xEE\xEB\xFC\xEA\xEE \xF1\xEF\xEE\xF1\xEE\xE1\xEE\xE2 \xEE\xF2\xF0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xE7\xE0\xE4\xE0\xED\xE8\xE5.<br/>
-<br/>
-\xC5\xF1\xEB\xE8 \xE7\xE0\xE4\xE0\xED\xE8\xE5 \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xE5\xF2\xF1\xFF \xED\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE5 \xCC\xEE\xE9 ITracker, \xE2\xFB \xEC\xEE\xE6\xE5\xF2\xE5 \xF9\xB8\xEB\xEA\xED\xF3\xF2\xFC \xE8\xEA\xEE\xED\xEA\xF3 \xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xEE\xE2\xE0\xF2\xFC
-(<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) \xF0\xFF\xE4\xEE\xEC
-\xF1 \xFD\xF2\xE8\xEC \xE7\xE0\xE4\xE0\xED\xE8\xE5\xEC.<br/>
-<br/>
-\xCA\xEE\xE3\xE4\xE0 \xE2\xFB \xEF\xF0\xEE\xF1\xEC\xE0\xF2\xF0\xE8\xE2\xE0\xE5\xF2\xE5 \xE4\xE5\xF2\xE0\xEB\xE8 \xE7\xE0\xE4\xE0\xED\xE8\xFF, \xE8\xEA\xEE\xED\xEA\xE0 \xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xEE\xE2\xE0\xF2\xFC
-(<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) \xE1\xF3\xE4\xE5\xF2
-\xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xF2\xFC\xF1\xFF \xE2 \xEE\xE1\xEB\xE0\xF1\xF2\xE8 \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xE9.<br/>
-<br/>
-\xD7\xF2\xEE\xE1\xFB \xEE\xF2\xF0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xF1\xF3\xF9\xE5\xF1\xF2\xE2\xF3\xFE\xF9\xE5\xE5 \xE7\xE0\xE4\xE0\xED\xE8\xE5, \xF1\xED\xE0\xF7\xE0\xEB\xE0 \xEF\xE5\xF0\xE5\xE9\xE4\xE8\xF2\xE5 \xED\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xF3 \xD1\xEF\xE8\xF1\xEE\xEA \xEF\xF0\xEE\xE5\xEA\xF2\xEE\xE2,
-\xF9\xB8\xEB\xEA\xED\xF3\xE2 \xED\xE0 \xEE\xE4\xED\xEE\xE8\xEC\xE5\xED\xED\xEE\xE9 \xF1\xF1\xFB\xEB\xEA\xE5 \xE2 \xE3\xEE\xEB\xEE\xE2\xED\xEE\xEC \xEC\xE5\xED\xFE. \xCD\xE0 \xE4\xE0\xED\xED\xEE\xE9 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE5 \xF9\xB8\xEB\xEA\xED\xE8\xF2\xE5 \xE8\xEA\xEE\xED\xEA\xF3 \xCF\xF0\xEE\xF1\xEC\xEE\xF2\xF0
-\xE7\xE0\xE4\xE0\xED\xE8\xE9 \xE2 \xEF\xF0\xEE\xE5\xEA\xF2\xE5 (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/view.gif"/>)
-\xF0\xFF\xE4\xEE\xEC \xF1 \xE8\xED\xF2\xE5\xF0\xE5\xF1\xF3\xFE\xF9\xE8\xEC \xEF\xF0\xEE\xE5\xEA\xF2\xEE\xEC. \xC8\xEC\xE5\xFF \xF1\xEF\xE8\xF1\xEE\xEA \xE7\xE0\xE4\xE0\xED\xE8\xE9, \xE2\xEE\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xE9\xF2\xE5\xF1\xFC \xE8\xEA\xEE\xED\xEA\xEE\xE9 \xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xEE\xE2\xE0\xF2\xFC
-(<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>)
-\xF0\xE0\xE4\xEE\xEC \xF1 \xED\xF3\xE6\xED\xFB\xEC \xE7\xE0\xE4\xE0\xED\xE8\xE5\xEC.<br/>
-<br/>
-\xC2\xE0\xEC \xED\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xEE \xE8\xEC\xE5\xF2\xFC \xEF\xEE\xEB\xED\xEE\xEC\xEE\xF7\xE8\xE5 \xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xE2 \xEF\xF0\xEE\xE5\xEA\xF2\xE5 \xEF\xE5\xF0\xE5\xE4 \xF2\xE5\xEC, \xEA\xE0\xEA \xE2\xFB \xF1\xEC\xEE\xE6\xE5\xF2\xE5
-\xF0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xE2 \xED\xB8\xEC \xF1\xF3\xF9\xE5\xF1\xF2\xE2\xF3\xFE\xF9\xE8\xE5 \xE7\xE0\xE4\xE0\xED\xE8\xFF.<br/>
+ ���� ��������� �������� ��������������� �������.<br/>
+ <br/>
+ ���� ������� ������������ �� �������� ��� ITracker, �� ������ ������� ������ �������������
+ (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) �����
+ � ���� ��������.<br/>
+ <br/>
+ ����� �� �������������� ������ �������, ������ �������������
+ (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>) �����
+ ������������ � ������� ��������.<br/>
+ <br/>
+ ����� ��������������� ������������ �������, ������� ��������� �� �������� ������ ��������,
+ ������ �� ����������� ������ � �������� ����. �� ������ �������� ������� ������ ��������
+ ������� � ������� (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/view.gif"/>)
+ ����� � ������������ ��������. ���� ������ �������, �������������� ������� �������������
+ (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/edit.gif"/>)
+ ����� � ������ ��������.<br/>
+ <br/>
+ ��� ���������� ����� ���������� ������������� � ������� ����� ���, ��� �� �������
+ ������������� � �� ������������ �������.<br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
-<a name="list"></a><span class="editColumnTitle">\xCF\xF0\xEE\xF1\xEC\xEE\xF2\xF0 \xE7\xE0\xE4\xE0\xED\xE8\xE9</span>
-<a href="#top" class="headerLinks">[\xED\xE0\xE2\xE5\xF0\xF5]</a><br/>
+<hr width="75%" noshade height="1"/>
+<a name="list"></a><span class="editColumnTitle">�������� �������</span>
+<a href="#top" class="headerLinks">[������]</a><br/>
+
<p class="help">
-\xD7\xF2\xEE\xE1\xFB \xEF\xEE\xF1\xEC\xEE\xF2\xF0\xE5\xF2\xFC \xF1\xEF\xE8\xF1\xEE\xEA \xE7\xE0\xE4\xE0\xED\xE8\xE9 \xE4\xEB\xFF \xEF\xF0\xEE\xE5\xEA\xF2\xE0, \xEF\xE5\xF0\xE5\xE9\xE4\xE8\xF2\xE5 \xED\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xF3 \xD1\xEF\xE8\xF1\xEE\xEA \xEF\xF0\xEE\xE5\xEA\xF2\xEE\xE2,
-\xF9\xB8\xEB\xEA\xED\xF3\xE2 \xED\xE0 \xEE\xE4\xED\xEE\xE8\xEC\xE5\xED\xED\xEE\xE9 \xF1\xF1\xFB\xEB\xEA\xE5 \xE2 \xE3\xEE\xEB\xEE\xE2\xED\xEE\xEC \xEC\xE5\xED\xFE. \xC4\xE0\xEB\xE5\xE5 \xED\xE0\xE6\xEC\xE8\xF2\xE5 \xE8\xEA\xEE\xED\xEA\xF3 \xCF\xF0\xEE\xF1\xEC\xEE\xF2\xF0 \xE7\xE0\xE4\xE0\xED\xE8\xE9 \xE2
-\xEF\xF0\xEE\xE5\xEA\xF2\xE5 (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/view.gif"/>)
-\xF0\xFF\xE4\xEE\xEC \xF1 \xEF\xF0\xEE\xE5\xEA\xF2\xEE\xEC, \xE7\xE0\xE4\xE0\xED\xE8\xFF \xEA\xEE\xF2\xEE\xF0\xEE\xE3\xEE \xF5\xEE\xF2\xE8\xF2\xE5 \xEF\xEE\xF1\xEC\xEE\xF2\xF0\xE5\xF2\xFC. \xCD\xE0 \xE4\xE0\xED\xED\xEE\xE9 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE5 \xE2\xFB \xEC\xEE\xE6\xE5\xF2\xE5 \xF3\xE2\xE8\xE4\xE5\xF2\xFC
-\xE4\xE5\xF2\xE0\xEB\xE8 \xE7\xE0\xE4\xE0\xED\xE8\xFF, \xEE\xF2\xF1\xEB\xE5\xE6\xE8\xE2\xE0\xF2\xFC \xE5\xE3\xEE, \xE5\xF1\xEB\xE8 \xE2\xFB \xF3\xE6\xE5 \xED\xE5 \xEF\xEE\xEB\xF3\xF7\xE0\xEB\xE8 \xF3\xE2\xE5\xE4\xEE\xEC\xEB\xE5\xED\xE8\xE9 \xEE\xE1 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xFF\xF5, \xE8\xEB\xE8
-\xF0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xE7\xE0\xE4\xE0\xED\xE8\xE5, \xEF\xF0\xE8 \xED\xE0\xEB\xE8\xF7\xE8\xE8 \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xF3\xFE\xF9\xE8\xF5 \xEF\xF0\xE8\xE2\xE8\xEB\xE5\xE3\xE8\xE9.<br/>
+ ����� ���������� ������ ������� ��� �������, ��������� �� �������� ������ ��������,
+ ������ �� ����������� ������ � �������� ����. ����� ������� ������ �������� ������� �
+ ������� (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/view.gif"/>)
+ ����� � ��������, ������� �������� ������ ����������. �� ������ �������� �� ������ �������
+ ������ �������, ����������� ���, ���� �� ��� �� �������� ����������� �� ����������, ���
+ ������������� �������, ��� ������� ��������������� ����������.<br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
-<a name="search"></a><span class="editColumnTitle">\xCF\xEE\xE8\xF1\xEA \xE7\xE0\xE4\xE0\xED\xE8\xE9</span>
-<a href="#top" class="headerLinks">[\xED\xE0\xE2\xE5\xF0\xF5]</a><br/>
+<hr width="75%" noshade height="1"/>
+<a name="search"></a><span class="editColumnTitle">����� �������</span>
+<a href="#top" class="headerLinks">[������]</a><br/>
+
<p class="help">
-\xD3 \xE2\xE0\xF1 \xE5\xF1\xF2\xFC \xE2\xEE\xE7\xEC\xEE\xE6\xED\xEE\xF1\xF2\xFC \xE8\xF1\xEA\xE0\xF2\xFC \xE7\xE0\xE4\xE0\xED\xE8\xFF \xE2 \xEF\xF0\xEE\xE5\xEA\xF2\xE0\xF5 \xEF\xEE \xE8\xF5 \xF1\xE5\xF0\xFC\xB8\xE7\xED\xEE\xF1\xF2\xE8 \xE8 \xEA\xEE\xE4\xE5 \xF1\xF2\xE0\xF2\xF3\xF1\xE0. \xD1\xEE
-\xF1\xF2\xF0\xE0\xED\xE8\xF6\xFB \xEF\xEE\xE8\xF1\xEA\xE0 \xE2\xFB \xEC\xEE\xE6\xE5\xF2\xE5 \xE2\xFB\xE1\xE8\xF0\xE0\xF2\xFC \xED\xE5\xF1\xEA\xEE\xEB\xFC\xEA\xEE \xE7\xED\xE0\xF7\xE5\xED\xE8\xE9 \xEE\xE4\xED\xEE\xE2\xF0\xE5\xEC\xE5\xED\xED\xEE, \xF3\xE4\xE5\xF0\xE6\xE8\xE2\xE0\xFF \xEA\xEB\xE0\xE2\xE8\xF8\xF3 Ctrl.
-\xC2\xEE\xE7\xEC\xEE\xE6\xED\xEE \xF2\xE0\xEA\xE6\xE5 \xE2\xFB\xE1\xF0\xE0\xF2\xFC \xE4\xE8\xE0\xEF\xE0\xE7\xEE\xED \xE7\xED\xE0\xF7\xE5\xED\xE8\xE9, \xF9\xB8\xEB\xEA\xED\xF3\xE2 \xED\xE0 \xEF\xE5\xF0\xE2\xEE\xEC \xFD\xEB\xE5\xEC\xE5\xED\xF2\xE5 \xE8, \xF3\xE4\xE5\xF0\xE6\xE8\xE2\xE0\xFF Shift,
-\xED\xE0 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE5\xEC \xFD\xEB\xE5\xEC\xE5\xED\xF2\xE5. \xD3\xEA\xE0\xE7\xE0\xE2 \xEA\xF0\xE8\xF2\xE5\xF0\xE8\xE8 \xEF\xEE\xE8\xF1\xEA\xE0 \xE8 \xF1\xEE\xF0\xF2\xE8\xF0\xEE\xE2\xEA\xE8, \xF9\xB8\xEB\xEA\xED\xE8\xF2\xE5 \xCF\xEE\xE8\xF1\xEA, \xF7\xF2\xEE\xE1\xFB \xED\xE0\xE9\xF2\xE8
-\xE2\xF1\xE5 \xF1\xEE\xE2\xEF\xE0\xE4\xE5\xED\xE8\xFF.
-<br/>
-\xCC\xEE\xE6\xED\xEE \xF2\xE0\xEA\xE6\xE5 \xE2\xFB\xEF\xEE\xEB\xED\xE8\xF2\xFC \xE1\xEE\xEB\xE5\xE5 \xE4\xE5\xF2\xE0\xEB\xFC\xED\xFB\xE9 \xEF\xEE\xE8\xF1\xEA \xE2 \xEA\xEE\xED\xEA\xF0\xE5\xF2\xED\xEE\xEC \xEF\xF0\xEE\xE5\xEA\xF2\xE5, \xF9\xB8\xEB\xEA\xED\xF3\xE2 \xED\xE0 \xE8\xEA\xEE\xED\xEA\xE5 \xCF\xEE\xE8\xF1\xEA
-\xE7\xE0\xE4\xE0\xED\xE8\xFF (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/search.gif"/>)
-\xF0\xFF\xE4\xEE\xEC \xF1 \xEF\xF0\xEE\xE5\xEA\xF2\xEE\xEC \xED\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE5 \xD1\xEF\xE8\xF1\xEE\xEA \xEF\xF0\xEE\xE5\xEA\xF2\xEE\xE2.
-<br/>
-\xC8\xE7 \xF1\xE5\xEA\xF6\xE8\xE8 \xF0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xEE\xE2 \xE2\xFB \xEC\xEE\xE6\xE5\xF2\xE5 \xF0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xE8\xEB\xE8 \xEF\xF0\xEE\xF1\xEC\xE0\xF2\xF0\xE8\xE2\xE0\xF2\xFC \xE7\xE0\xE4\xE0\xED\xE8\xFF \xEF\xF0\xE8 \xED\xE0\xEB\xE8\xF7\xE8\xE8
-\xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xF3\xFE\xF9\xE8\xF5 \xEF\xEE\xEB\xED\xEE\xEC\xEE\xF7\xE8\xE9, \xF9\xB8\xEB\xEA\xED\xF3\xE2 \xED\xE0 \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xF3\xFE\xF9\xE5\xE9 \xE8\xEA\xEE\xED\xEA\xE5.
-<br/>
+ � ��� ���� ����������� ������ ������� � �������� �� �� ���������� � ���� �������. ��
+ �������� ������ �� ������ �������� ��������� �������� ������������, ��������� ������� Ctrl.
+ �������� ����� ������� �������� ��������, ������ �� ������ �������� �, ��������� Shift,
+ �� ��������� ��������. ������ �������� ������ � ����������, ������� �����, ����� �����
+ ��� ����������.
+ <br/>
+ ����� ����� ��������� ����� ��������� ����� � ���������� �������, ������ �� ������ �����
+ ������� (<html:img styleClass="helpImage" src="../themes/defaulttheme/images/search.gif"/>)
+ ����� � �������� �� �������� ������ ��������.
+ <br/>
+ �� ������ ����������� �� ������ ������������� ��� ������������� ������� ��� �������
+ ��������������� ����������, ������ �� ��������������� ������.
+ <br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
-<a name="report"></a><span class="editColumnTitle">\xC3\xE5\xED\xE5\xF0\xE0\xF6\xE8\xFF \xEE\xF2\xF7\xB8\xF2\xEE\xE2</span>
-<a href="#top" class="headerLinks">[\xED\xE0\xE2\xE5\xF0\xF5]</a><br/>
+<hr width="75%" noshade height="1"/>
+<a name="report"></a><span class="editColumnTitle">��������� �������</span>
+<a href="#top" class="headerLinks">[������]</a><br/>
+
<p class="help">
-\xC4\xEB\xFF \xE3\xE5\xED\xE5\xF0\xE0\xF6\xE8\xE8 \xEE\xF2\xF7\xB8\xF2\xE0, \xF1\xED\xE0\xF7\xE0\xEB\xE0 \xEE\xF2\xEC\xE5\xF2\xFC\xF2\xE5 \xEF\xEE\xE7\xE8\xF6\xE8\xE8 \xF0\xFF\xE4\xEE\xEC \xF1 \xEF\xF0\xEE\xE5\xEA\xF2\xE0\xEC\xE8, \xEA\xEE\xF2\xEE\xF0\xFB\xE5 \xE6\xE5\xEB\xE0\xE5\xF2\xE5
-\xE2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xE2 \xEE\xF2\xF7\xB8\xF2. \xC7\xE0\xF2\xE5\xEC \xE2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 \xF2\xF0\xE5\xE1\xF3\xE5\xEC\xFB\xE9 \xEE\xF2\xF7\xB8\xF2 \xE8\xE7 \xE2\xFB\xEF\xE0\xE4\xE0\xFE\xF9\xE5\xE3\xEE \xEC\xE5\xED\xFE \xE8 \xED\xE0\xE6\xEC\xE8\xF2\xE5 \xEA\xED\xEE\xEF\xEA\xF3
-\xE3\xE5\xED\xE5\xF0\xE0\xF6\xE8\xE8 \xEE\xF2\xF7\xB8\xF2\xE0. \xCE\xF2\xF7\xB8\xF2 \xE1\xF3\xE4\xE5\xF2 \xF1\xE3\xE5\xED\xE5\xF0\xE8\xF0\xEE\xE2\xE0\xED, \xE0 \xF0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xFB \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE5\xED\xFB \xE2 \xE2\xE0\xF8\xE5\xEC \xF2\xE5\xEA\xF3\xF9\xE5\xEC \xEE\xEA\xED\xE5
-\xE1\xF0\xE0\xF3\xE7\xE5\xF0\xE0. \xC2 \xE7\xE0\xE2\xE8\xF1\xE8\xEC\xEE\xF1\xF2\xE8 \xEE\xF2 \xF7\xE8\xF1\xEB\xE0 \xE7\xE0\xE4\xE0\xED\xE8\xE9 \xE2 \xEF\xF0\xEE\xE5\xEA\xF2\xE5 \xE8 \xEA\xEE\xEB\xE8\xF7\xE5\xF1\xF2\xE2\xE0 \xE2\xFB\xE1\xF0\xE0\xED\xED\xFB\xF5 \xEF\xF0\xEE\xE5\xEA\xF2\xEE\xE2, \xEC\xEE\xE6\xE5\xF2
-\xEF\xEE\xF2\xF0\xE5\xE1\xEE\xE2\xE0\xF2\xFC\xF1\xFF \xE4\xEE \xED\xE5\xF1\xEA\xEE\xEB\xFC\xEA\xE8\xF5 \xEC\xE8\xED\xF3\xF2 \xE4\xEB\xFF \xEE\xE1\xF0\xE0\xE1\xEE\xF2\xEA\xE8 \xEE\xF2\xF7\xB8\xF2\xE0.
-<br/>
+ ��� ��������� ������, ������� �������� ������� ����� � ���������, ������� �������
+ �������� � �����. ����� �������� ��������� ����� �� ����������� ���� � ������� ������
+ ��������� ������. ����� ����� ������������, � ���������� ���������� � ����� ������� ����
+ ��������. � ����������� �� ����� ������� � ������� � ���������� ��������� ��������, �����
+ ������������� �� ���������� ����� ��� ��������� ������.
+ <br/>
</p>
-<center><hr width="75%" noshade height="1"/></center>
-<a name="prefs"></a><span class="editColumnTitle">\xC8\xE7\xEC\xE5\xED\xE5\xED\xE8\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE5\xEA</span>
-<a href="#top" class="headerLinks">[\xED\xE0\xE2\xE5\xF0\xF5]</a><br/>
+<hr width="75%" noshade height="1"/>
+<a name="prefs"></a><span class="editColumnTitle">��������� ��������</span>
+<a href="#top" class="headerLinks">[������]</a><br/>
+
<p class="help">
-\xD7\xF2\xEE\xE1 \xE8\xE7\xEC\xE5\xED\xE8\xF2\xFC \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xF9\xB8\xEB\xEA\xED\xE8\xF2\xE5 \xED\xE0 \xF1\xF1\xFB\xEB\xEA\xE5 \xCC\xEE\xE8 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xE2 \xE3\xEE\xEB\xEE\xE2\xED\xEE\xEC \xEC\xE5\xED\xFE. \xDD\xF2\xEE \xEF\xF0\xE8\xE2\xE5\xE4\xB8\xF2 \xE2\xE0\xF1
-\xED\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xF3, \xEF\xEE\xE7\xE2\xEE\xEB\xFF\xFE\xF9\xF3\xFE \xE8\xE7\xEC\xE5\xED\xE8\xF2\xFC \xE2\xE0\xF8\xF3 \xEB\xE8\xF7\xED\xF3\xFE \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xFE. \xCD\xE5\xEA\xEE\xF2\xEE\xF0\xFB\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xE8\xE7\xEC\xE5\xED\xFF\xFE\xF2
-\xE2\xED\xE5\xF8\xED\xE8\xE9 \xE2\xE8\xE4 \xF1\xE0\xE9\xF2\xE0.<br/>
-<br/>
-\xCF\xF0\xE8 \xE2\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE8 \xEE\xEF\xF6\xE8\xE8 \xE0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xEE\xE3\xEE \xE2\xF5\xEE\xE4\xE0 \xE2 \xF1\xE8\xF1\xF2\xE5\xEC\xF3, \xED\xE0 \xE2\xE0\xF8\xE5\xEC \xEA\xEE\xEC\xEF\xFC\xFE\xF2\xE5\xF0\xE5 \xE1\xF3\xE4\xE5\xF2 \xF1\xEE\xF5\xF0\xE0\xED\xB8\xED
-\xEF\xEE\xF1\xF2\xEE\xFF\xED\xED\xFB\xE9 \xEA\xF3\xEA\xE8-\xF4\xE0\xE9\xEB \xF1 \xE2\xE0\xF8\xE8\xEC \xE8\xE4\xE5\xED\xF2\xE8\xF4\xE8\xEA\xE0\xF2\xEE\xF0\xEE\xEC \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xFF \xE8 \xEF\xE0\xF0\xEE\xEB\xE5\xEC. \xDD\xF2\xEE \xEC\xEE\xE6\xE5\xF2 \xE2\xFB\xE7\xE2\xE0\xF2\xFC
-\xEF\xF0\xEE\xE1\xEB\xE5\xEC\xFB \xE1\xE5\xE7\xEE\xEF\xE0\xF1\xED\xEE\xF1\xF2\xE8, \xF2\xE0\xEA \xF7\xF2\xEE \xF3\xE1\xE5\xE4\xE8\xF2\xE5\xF1\xFC, \xF7\xF2\xEE \xE2\xE0\xEC \xED\xF3\xE6\xED\xE0 \xE4\xE0\xED\xED\xE0\xFF \xEE\xEF\xF6\xE8\xFF \xEF\xF0\xE5\xE6\xE4\xE5 \xF7\xE5\xEC \xE2\xEA\xEB\xFE\xF7\xE0\xF2\xFC \xE5\xB8.
-<br/>
-<br/>
-\xCF\xF0\xE8 \xF3\xEA\xE0\xE7\xE0\xED\xE8\xE8 \xEA\xEE\xEB\xE8\xF7\xE5\xF1\xF2\xE2\xE0 \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xE5\xEC\xFB\xF5 \xE7\xE0\xE4\xE0\xED\xE8\xE9 \xED\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE5, \xE2\xFB \xEC\xEE\xE6\xE5\xF2\xE5 \xE2\xE2\xE5\xF1\xF2\xE8 0 \xE8\xEB\xE8
-\xEE\xF2\xF0\xE8\xF6\xE0\xF2\xE5\xEB\xFC\xED\xEE\xE5 \xE7\xED\xE0\xF7\xE5\xED\xE8\xE5 \xF7\xF2\xEE\xE1\xFB \xEE\xF2\xEE\xE1\xF0\xE0\xE7\xE8\xF2\xFC \xE2\xF1\xE5. \xCB\xFE\xE1\xEE\xE5 \xEF\xEE\xEB\xEE\xE6\xE8\xF2\xE5\xEB\xFC\xED\xEE\xE5 \xF7\xE8\xF1\xEB\xEE \xEE\xE3\xF0\xE0\xED\xE8\xF7\xE8\xF2
-\xEA\xEE\xEB\xE8\xF7\xE5\xF1\xF2\xE2\xEE \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xE5\xEC\xFB\xF5 \xFD\xEB\xE5\xEC\xE5\xED\xF2\xEE\xE2.
-<br/>
+ ���� �������� ��������� ������� �� ������ ��� ��������� � �������� ����. ��� ������� ���
+ �� ��������, ����������� �������� ���� ������ ����������. ��������� ��������� ��������
+ ������� ��� �����.<br/>
+ <br/>
+ ��� ��������� ����� ��������������� ����� � �������, �� ����� ���������� ����� �������
+ ���������� ����-���� � ����� ��������������� ������������ � �������. ��� ����� �������
+ �������� ������������, ��� ��� ���������, ��� ��� ����� ������ ����� ������ ��� �������� �.
+ <br/>
+ <br/>
+ ��� �������� ���������� ������������ ������� �� ��������, �� ������ ������ 0 ���
+ ������������� �������� ����� ���������� ���. ����� ������������� ����� ���������
+ ���������� ������������ ���������.
+ <br/>
</p>
Modified: itracker/trunk/src/main/webapp/module-help/show_help.jsp
===================================================================
--- itracker/trunk/src/main/webapp/module-help/show_help.jsp 2012-10-16 12:25:40 UTC (rev 2324)
+++ itracker/trunk/src/main/webapp/module-help/show_help.jsp 2012-10-16 12:28:29 UTC (rev 2325)
@@ -1,9 +1,6 @@
<%@ include file="/common/taglibs.jsp"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
- <body onload="javascript:self.focus()">
-
- <tiles:insert page="/themes/defaulttheme/includes/header.jsp"/>
+
<table border="0" cellspacing="1" cellspacing="0" width="100%">
<tr>
<td>itracker.org</td>
@@ -16,6 +13,3 @@
<!-- Now include the appropriate help file ${helpPage} -->
<jsp:include page="${helpPage}" flush="true" />
-
-<tiles:insert page="/themes/defaulttheme/includes/footer.jsp"/></body></html>
-</body>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-10-16 12:25:51
|
Revision: 2324
http://itracker.svn.sourceforge.net/itracker/?rev=2324&view=rev
Author: ranks
Date: 2012-10-16 12:25:40 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
struts search module config fixes
Modified Paths:
--------------
itracker/trunk/src/main/webapp/WEB-INF/config/struts-module-searchissues-config.xml
Modified: itracker/trunk/src/main/webapp/WEB-INF/config/struts-module-searchissues-config.xml
===================================================================
--- itracker/trunk/src/main/webapp/WEB-INF/config/struts-module-searchissues-config.xml 2012-10-16 12:22:58 UTC (rev 2323)
+++ itracker/trunk/src/main/webapp/WEB-INF/config/struts-module-searchissues-config.xml 2012-10-16 12:25:40 UTC (rev 2324)
@@ -56,15 +56,22 @@
</action>
</action-mappings>
+ <!-- ==================================== Controller -->
+ <controller processorClass="org.apache.struts.tiles.TilesRequestProcessor">
+ <set-property property="inputForward" value="false"/>
+ </controller>
+
+ <!-- ==================================== Message-resources -->
<message-resources factory="org.itracker.web.resources.ITrackerMessageResourcesFactory"
parameter="org.itracker.core.resources.ITracker" null="false"/>
+ <!-- ==================================== Plug-ins -->
<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
<set-property property="pathnames"
value="/WEB-INF/config/validator-rules.xml,
/WEB-INF/config/validation-module-searchissues.xml"/>
+ </plug-in>
- </plug-in>
<plug-in className="org.apache.struts.tiles.TilesPlugin">
<set-property
property="definitions-config"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-10-16 12:23:04
|
Revision: 2323
http://itracker.svn.sourceforge.net/itracker/?rev=2323&view=rev
Author: ranks
Date: 2012-10-16 12:22:58 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
cleanup search-issues tiles defs
Modified Paths:
--------------
itracker/trunk/src/main/webapp/WEB-INF/config/tiles-defs-search-issues.xml
Modified: itracker/trunk/src/main/webapp/WEB-INF/config/tiles-defs-search-issues.xml
===================================================================
--- itracker/trunk/src/main/webapp/WEB-INF/config/tiles-defs-search-issues.xml 2012-10-16 12:09:43 UTC (rev 2322)
+++ itracker/trunk/src/main/webapp/WEB-INF/config/tiles-defs-search-issues.xml 2012-10-16 12:22:58 UTC (rev 2323)
@@ -4,9 +4,6 @@
"http://struts.apache.org/dtds/tiles-config_1_3.dtd">
<tiles-definitions>
- <definition name="test">
-
- </definition>
<!-- search -->
<definition name="t.search_issues_form" extends="mainLayout">
<put name="body" value="/module-searchissues/search_issues_form.jsp"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-10-16 12:09:54
|
Revision: 2322
http://itracker.svn.sourceforge.net/itracker/?rev=2322&view=rev
Author: ranks
Date: 2012-10-16 12:09:43 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
fixes to struts/tiles config, adding forgot-password to tiles, jsp/html fixes
Modified Paths:
--------------
itracker/trunk/src/main/webapp/WEB-INF/config/struts-config.xml
itracker/trunk/src/main/webapp/WEB-INF/config/tiles-defs.xml
itracker/trunk/src/main/webapp/forgot_password.jsp
itracker/trunk/src/main/webapp/login.jsp
itracker/trunk/src/main/webapp/self_register.jsp
itracker/trunk/src/main/webapp/unauthorized.jsp
Modified: itracker/trunk/src/main/webapp/WEB-INF/config/struts-config.xml
===================================================================
--- itracker/trunk/src/main/webapp/WEB-INF/config/struts-config.xml 2012-10-16 12:03:31 UTC (rev 2321)
+++ itracker/trunk/src/main/webapp/WEB-INF/config/struts-config.xml 2012-10-16 12:09:43 UTC (rev 2322)
@@ -87,7 +87,7 @@
name="watchIssueForm" scope="request" input="/index.jsp" validate="false"/>
<action path="/assignissue" type="org.itracker.web.actions.project.AssignIssueAction"
name="assignIssueForm" scope="request" input="/index.jsp"/>
- <action path="/portalhome" input="t.portalhome" type="org.itracker.web.actions.PortalHomeAction">
+ <action path="/portalhome" type="org.itracker.web.actions.PortalHomeAction">
<forward name="portalhome" path="t.portalhome"/>
</action>
@@ -108,19 +108,21 @@
<action path="/login" type="org.itracker.web.actions.user.LoginAction"
name="loginForm" scope="request" input="t.login">
<forward name="login" path="t.login"/>
- <forward name="index" module="/" path="/index.jsp" redirect="true"/>
+ <forward name="index" module="/" path="/portalhome.do" redirect="true"/>
</action>
<action path="/forgotpasswordform" type="org.itracker.web.actions.user.ForgotPasswordFormAction"
- name="forgotPasswordForm" scope="request" input="/forgot_password.jsp" validate="false"/>
+ name="forgotPasswordForm" scope="request" input="t.forgotpassword" validate="false"/>
<action path="/forgotpassword" type="org.itracker.web.actions.user.ForgotPasswordAction"
- name="forgotPasswordForm" scope="request" input="/forgot_password.jsp" validate="true">
+ name="forgotPasswordForm" scope="request" input="t.forgotpassword" validate="true">
<forward name="forgotpassword" module="/" path="/forgotpasswordform.do"/>
<forward name="success" module="/" path="/portalhome.do" redirect="true"/>
</action>
- <action path="/logoff" type="org.itracker.web.actions.user.LogoffAction"/>
+ <action path="/logoff" type="org.itracker.web.actions.user.LogoffAction">
+ <forward name="login" path="t.login"/>
+ </action>
<action path="/listprojects" type="org.itracker.web.actions.ListProjectsAction">
<forward name="listprojects" path="/module-projects/list_projects.jsp"/>
@@ -139,10 +141,9 @@
validate="false"/>
</action-mappings>
- <controller>
+ <controller processorClass="org.apache.struts.tiles.TilesRequestProcessor">
<set-property property="inputForward" value="false"/>
</controller>
- <message-resources factory="web.resources.ITrackerMessageResourcesFactory" parameter="UNUSED" null="false"/>
<message-resources factory="org.itracker.web.resources.ITrackerMessageResourcesFactory"
parameter="org.itracker.core.resources.ITracker" null="false"/>
Modified: itracker/trunk/src/main/webapp/WEB-INF/config/tiles-defs.xml
===================================================================
--- itracker/trunk/src/main/webapp/WEB-INF/config/tiles-defs.xml 2012-10-16 12:03:31 UTC (rev 2321)
+++ itracker/trunk/src/main/webapp/WEB-INF/config/tiles-defs.xml 2012-10-16 12:09:43 UTC (rev 2322)
@@ -26,6 +26,9 @@
<definition name="t.login" extends="mainLayout">
<put name="body" value="/login.jsp"/>
</definition>
+ <definition name="t.forgotpassword" extends="mainLayout">
+ <put name="body" value="/forgot_password.jsp"/>
+ </definition>
<definition name="t.selfregisterform" extends="mainLayout">
<put name="body" value="/self_register.jsp"/>
</definition>
Modified: itracker/trunk/src/main/webapp/forgot_password.jsp
===================================================================
--- itracker/trunk/src/main/webapp/forgot_password.jsp 2012-10-16 12:03:31 UTC (rev 2321)
+++ itracker/trunk/src/main/webapp/forgot_password.jsp 2012-10-16 12:09:43 UTC (rev 2322)
@@ -1,48 +1,34 @@
-<%@ include file="/common/taglibs.jsp"%>
+<%@ include file="/common/taglibs.jsp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<tiles:insert page="/themes/defaulttheme/includes/header.jsp"/>
-
<c:choose>
- <%-- <nitrox:var name="allowForgotPassword" type="java.lang.Boolean"/> --%>
- <c:when test="${! allowForgotPassword}">
- <center><span style="color: red;"><it:message key="itracker.web.error.notenabled"/></span></center>
- </c:when>
- <c:otherwise>
+ <%-- <nitrox:var name="allowForgotPassword" type="java.lang.Boolean"/> --%>
+ <c:when test="${! allowForgotPassword}">
+ <span style="color: red;"><it:message key="itracker.web.error.notenabled"/></span>
+ </c:when>
+ <c:otherwise>
- <html:form action="/forgotpassword" focus="login" onsubmit="validateForgotPasswordForm(this);">
+ <html:form action="/forgotpassword" focus="login" onsubmit="validateForgotPasswordForm(this);">
- <html:javascript formName="forgotPasswordForm"/>
+ <html:javascript formName="forgotPasswordForm" />
- <logic:messagesPresent>
- <center>
- <span class="formError">
- <html:messages id="error">
- <bean:write name="error"/><br/>
- </html:messages>
- </span>
- </center>
- <br>
- </logic:messagesPresent>
- <table border="0" cellpadding="2" cellspacing="0" align="left">
- <tr>
- <td align="left" class="editColumnTitle"><it:message key="itracker.web.attr.login"/>: </td>
- <td align="left"><html:text property="login" styleClass="editColumnText"/></td>
- </tr>
- <tr>
- <td align="left" class="editColumnTitle"><it:message key="itracker.web.attr.lastname"/>: </td>
- <td align="left"><html:text property="lastName" styleClass="editColumnText"/></td>
- </tr>
- <tr><td><html:img module="/" page="/themes/defaulttheme/images/blank.gif" width="1" height="10"/></td></tr>
- <tr>
- <td colspan="2" align="left"><html:submit styleClass="button" altKey="itracker.web.button.submit.alt" titleKey="itracker.web.button.submit.alt"><it:message key="itracker.web.button.submit"/></html:submit></td>
- </tr>
- </table>
+ <table border="0" cellpadding="2" cellspacing="0" align="left">
+ <tr>
+ <td align="left" class="editColumnTitle"><it:message key="itracker.web.attr.login"/>:</td>
+ <td align="left"><html:text property="login" styleClass="editColumnText"/></td>
+ </tr>
+ <tr>
+ <td align="left" class="editColumnTitle"><it:message key="itracker.web.attr.lastname"/>:</td>
+ <td align="left"><html:text property="lastName" styleClass="editColumnText"/></td>
+ </tr>
+ <tr>
+ <td colspan="2" align="left"><html:submit styleClass="button"
+ altKey="itracker.web.button.submit.alt"
+ titleKey="itracker.web.button.submit.alt"><it:message
+ key="itracker.web.button.submit"/></html:submit></td>
+ </tr>
+ </table>
- </html:form>
- </c:otherwise>
+ </html:form>
+ </c:otherwise>
</c:choose>
-
-
-<tiles:insert page="/themes/defaulttheme/includes/footer.jsp"/></body></html>
Modified: itracker/trunk/src/main/webapp/login.jsp
===================================================================
--- itracker/trunk/src/main/webapp/login.jsp 2012-10-16 12:03:31 UTC (rev 2321)
+++ itracker/trunk/src/main/webapp/login.jsp 2012-10-16 12:09:43 UTC (rev 2322)
@@ -4,7 +4,7 @@
<input type="hidden" name="authtype" value="1">
<%-- TODO is this AUTH_REDIRECT_KEY still needed? --%>
<logic:notEmpty name="authredirect" scope="request">
- <input type="hidden" name="authredirect" value="<bean:write name="authredirect" scope="request"/>">
+ <input type="hidden" name="authredirect" value="<bean:write name="authredirect" scope="request" />">
</logic:notEmpty>
<html:javascript formName="loginForm"/>
@@ -18,10 +18,8 @@
<td align="left" class="editColumnTitle"><it:message key="itracker.web.attr.password"/>:</td>
<td align="left"><html:password property="password" styleClass="editColumnText" redisplay="false"/></td>
</tr>
- <tr><td><html:img module="/" page="/themes/defaulttheme/images/blank.gif" width="1" height="10"/></td></tr>
<tr>
<td colspan="2" align="left"><html:submit styleClass="button" altKey="itracker.web.button.login.alt" titleKey="itracker.web.button.login.alt"><it:message key="itracker.web.button.login"/></html:submit></td>
</tr>
</table>
-<br>
</html:form>
\ No newline at end of file
Modified: itracker/trunk/src/main/webapp/self_register.jsp
===================================================================
--- itracker/trunk/src/main/webapp/self_register.jsp 2012-10-16 12:03:31 UTC (rev 2321)
+++ itracker/trunk/src/main/webapp/self_register.jsp 2012-10-16 12:09:43 UTC (rev 2322)
@@ -44,10 +44,6 @@
<td align="right" class="editColumnTitle"><it:message key="itracker.web.attr.email"/>:</td>
<td align="left"><html:text property="email" styleClass="editColumnText"/></td>
</tr>
- <tr>
- <td colspan="4"><html:img module="/" page="/themes/defaulttheme/images/blank.gif" height="15"
- width="1"/></td>
- </tr>
</table>
<table border="0" cellspacing="0" cellspacing="1" width="100%" align="left">
Modified: itracker/trunk/src/main/webapp/unauthorized.jsp
===================================================================
--- itracker/trunk/src/main/webapp/unauthorized.jsp 2012-10-16 12:03:31 UTC (rev 2321)
+++ itracker/trunk/src/main/webapp/unauthorized.jsp 2012-10-16 12:09:43 UTC (rev 2322)
@@ -1,4 +1,4 @@
-<%@ include file="/common/taglibs.jsp"%>
+<%@ include file="/common/taglibs.jsp" %>
<bean:define id="pageTitleKey" value="itracker.web.unauthorized.title"/>
<bean:define id="pageTitleArg" value=""/>
@@ -6,6 +6,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<tiles:insert page="/themes/defaulttheme/includes/header.jsp"/>
-<center><span style="color: red;"><it:message key="itracker.web.error.unauthorized"/></span></center>
+<span style="color: red;"><it:message key="itracker.web.error.unauthorized"/></span>
<tiles:insert page="/themes/defaulttheme/includes/footer.jsp"/></body></html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-10-16 12:03:37
|
Revision: 2321
http://itracker.svn.sourceforge.net/itracker/?rev=2321&view=rev
Author: ranks
Date: 2012-10-16 12:03:31 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
fixing title for german 'forgot password'
Modified Paths:
--------------
itracker/trunk/src/main/resources/org/itracker/core/resources/ITracker_de.properties
Modified: itracker/trunk/src/main/resources/org/itracker/core/resources/ITracker_de.properties
===================================================================
--- itracker/trunk/src/main/resources/org/itracker/core/resources/ITracker_de.properties 2012-10-16 12:00:04 UTC (rev 2320)
+++ itracker/trunk/src/main/resources/org/itracker/core/resources/ITracker_de.properties 2012-10-16 12:03:31 UTC (rev 2321)
@@ -209,7 +209,7 @@
Wichtigkeit: {5}\n \
Eigent\xFCmer: {6}\n \
Komponenten: {7}\n\n \
- Letzter Verlaufseintrag (von {8}):\n {9}\n \
+ Letzter Verlaufseintrag (von {8}):\n {9}\n\n \
Aktivit\xE4ten: {10}\n \
Verteiler Liste:{11}
@@ -615,7 +615,7 @@
itracker.web.index.hidehidden=[Versteckte Sektionen ausblenden]
itracker.web.index.lessissues=[Weitere Fehler ausblenden]
itracker.web.issueactivity.title=Aktivit\xE4t vom Fehler {0}
-itracker.web.forgotpass.title=Habe Passwort vergessen
+itracker.web.forgotpass.title=Passwort vergessen
itracker.web.listissues.title=Fehlerliste f\xFCr {0}
itracker.web.listprojects.title=Fehler nach Projekt
itracker.web.listprojects.locked.hide=[Verstecke gesperrte Projekte]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-10-16 12:00:13
|
Revision: 2320
http://itracker.svn.sourceforge.net/itracker/?rev=2320&view=rev
Author: ranks
Date: 2012-10-16 12:00:04 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
moving the configuration to classpath, fixed version from current POM (filtered value)
Modified Paths:
--------------
itracker/trunk/src/main/resources/services-context.xml
itracker/trunk/src/test/resources/configuration.properties
Added Paths:
-----------
itracker/trunk/src/main/resources/configuration.properties
Removed Paths:
-------------
itracker/trunk/src/main/webapp/WEB-INF/configuration.properties
Copied: itracker/trunk/src/main/resources/configuration.properties (from rev 2319, itracker/trunk/src/main/webapp/WEB-INF/configuration.properties)
===================================================================
--- itracker/trunk/src/main/resources/configuration.properties (rev 0)
+++ itracker/trunk/src/main/resources/configuration.properties 2012-10-16 12:00:04 UTC (rev 2320)
@@ -0,0 +1,121 @@
+###
+### Sample configuration properties file
+###
+
+project=${project.artifactId}
+version=${project.version}
+
+# In order to affect a particular ITracker deployment, a copy of this file
+# can be placed at the root of any directory in the container's classpath.
+
+# This property can be used to override the url determined dynamically
+# by the system when a user submits an issue or self registers. This
+# is mainly due to some users using private domain names that wouldn't
+# be accessible to all recipients of a notification email. This
+# property is only used to create urls in emails sent to all users.
+system_base_url=http://localhost:8080/itracker
+
+# This property can be used to override the configuration properties
+# by JNDI values e.g. exposed by the container of the application in a
+# certain context
+# default: don't lookup JNDI for override values
+jndi_override_prefix=java:comp/env/itracker
+
+# This property defines a JNDI lookup for the mail session of the
+# itracker system.
+# default: don't use mailsession, instead use defined notification_smtp_host
+# notification_smtp_userid and notification_smtp_password
+mail_session_jndi_lookup=java:comp/env/itracker/mail/Session
+
+# This property can be used to set the web session inactivity timeout.
+# This number is the number of minutes that can elapse before the users
+# session times out due to inactivity.
+web_session_timeout=30
+
+# Set this if you wish to use an alternate image logo in the header of all
+# pages. It must be a resolvable url. (type : String)
+#alternate_logo=/images/logo.gif
+
+# Set to the default locale of the server. This controls the default language
+# for users after they are logged in, and also the language of the login
+# page before they are logged in. This MUST be in the format
+# language_country (eg. en_US, de_DE, pt_PT, it_IT) (type : String)
+default_locale=de_DE
+
+# Set to true to create a default admin user if no other users exist in the
+# database (type : Boolean)
+create_super_user=true
+
+# Set to true to allow users to recover their passwords (type : Boolean)
+allow_forgot_password=true
+
+# Set to true to allow users to self register for your sever. This is a global
+# setting that must be enabled for the project level options to be effective. If
+# enabled, you must then go into each project you want accessible to self registered
+# users, and which permissiosn you want. Currently only create and view all are
+# available (view own is automatically granted), if you want other permissions, you
+# must grant them using the normal user administration procedures. (type : Boolean)
+allow_self_register=true
+
+# Set to true to allow users to save their login in a cookie on their machine
+# for auto login. Setting this to false will not allow any user on the system
+# to use this feature. (type : Boolean)
+allow_save_login=true
+
+# This parameter sets the class to use for authentication. The class must be resident
+# in the classpath that the ear is loaded in, and extend the
+# org.itracker.services.authentication.PluggableAuthenticator abstract class. (type : String)
+#authenticator_class=com.emation.itracker.authentication.WindowsSSONAuthenticatorADInfo
+
+# From address for email notifications to use
+notification_from_address=itracker@localhost
+
+# From address text for email notifications to use
+notification_from_text=ITracker Notification System
+
+# ReplyTo address for email notifications to use
+notification_replyto_address=itracker@localhost
+
+# SMTP hostname for email notifications to use
+notification_smtp_host=localhost
+
+# SMTP notificate character set. You might need to change this for
+# some locales
+#notification_smtp_charset=UTF-8
+
+# SMTP authentication userid and password if required by
+# your application server
+#notification_smtp_userid=kim...@be...
+#notification_smtp_password=4557436
+
+# All attachments are now stored in the database, but you can still
+# control the maximum size of any one attachment, and the total
+# that can be stored.
+
+# The maximum size of an individual issue attachment in kb.
+max_attachment_size=512
+
+# The maximum total size of all attachments in kb.
+max_total_attachment_size=100000
+
+# Table for CMP for the Component Entity Bean. Needed for search.
+#componentbean_table_name=componentbean
+
+# Table for CMP for the Issue Component Relation. Needed for search.
+#componentbean_rel_table_name=issue_component_rel
+
+# Table for CMP for the Issue Entity Bean. Needed for search.
+#issuebean_table_name=issuebean
+
+# Table for CMP for the IssueHistory Entity Bean. Needed for search.
+#issuehistorybean_table_name=issuehistorybean
+
+# Table for CMP for the Project Entity Bean. Needed for search.
+#projectbean_table_name=projectbean
+
+# Table for CMP for the Version Entity Bean. Needed for search.
+#versionbean_table_name=versionbean
+
+# Table for CMP for the Issue Version Relation. Needed for search.
+#versionbean_rel_table_name=issue_version_rel
+
Modified: itracker/trunk/src/main/resources/services-context.xml
===================================================================
--- itracker/trunk/src/main/resources/services-context.xml 2012-08-31 10:05:14 UTC (rev 2319)
+++ itracker/trunk/src/main/resources/services-context.xml 2012-10-16 12:00:04 UTC (rev 2320)
@@ -65,7 +65,7 @@
</bean>
<bean id="configurationProperties" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
- <property name="location" value="/WEB-INF/configuration.properties"/>
+ <property name="location" value="classpath:configuration.properties"/>
</bean>
<!--
Deleted: itracker/trunk/src/main/webapp/WEB-INF/configuration.properties
===================================================================
--- itracker/trunk/src/main/webapp/WEB-INF/configuration.properties 2012-08-31 10:05:14 UTC (rev 2319)
+++ itracker/trunk/src/main/webapp/WEB-INF/configuration.properties 2012-10-16 12:00:04 UTC (rev 2320)
@@ -1,121 +0,0 @@
-###
-### Sample configuration properties file
-###
-
-project=itracker
-version=3.0.0
-
-# In order to affect a particular ITracker deployment, a copy of this file
-# can be placed at the root of any directory in the container's classpath.
-
-# This property can be used to override the url determined dynamically
-# by the system when a user submits an issue or self registers. This
-# is mainly due to some users using private domain names that wouldn't
-# be accessible to all recipients of a notification email. This
-# property is only used to create urls in emails sent to all users.
-system_base_url=http://localhost:8080/itracker
-
-# This property can be used to override the configuration properties
-# by JNDI values e.g. exposed by the container of the application in a
-# certain context
-# default: don't lookup JNDI for override values
-jndi_override_prefix=java:comp/env/itracker
-
-# This property defines a JNDI lookup for the mail session of the
-# itracker system.
-# default: don't use mailsession, instead use defined notification_smtp_host
-# notification_smtp_userid and notification_smtp_password
-mail_session_jndi_lookup=java:comp/env/itracker/mail/Session
-
-# This property can be used to set the web session inactivity timeout.
-# This number is the number of minutes that can elapse before the users
-# session times out due to inactivity.
-web_session_timeout=30
-
-# Set this if you wish to use an alternate image logo in the header of all
-# pages. It must be a resolvable url. (type : String)
-#alternate_logo=/images/logo.gif
-
-# Set to the default locale of the server. This controls the default language
-# for users after they are logged in, and also the language of the login
-# page before they are logged in. This MUST be in the format
-# language_country (eg. en_US, de_DE, pt_PT, it_IT) (type : String)
-default_locale=en_US
-
-# Set to true to create a default admin user if no other users exist in the
-# database (type : Boolean)
-create_super_user=true
-
-# Set to true to allow users to recover their passwords (type : Boolean)
-allow_forgot_password=true
-
-# Set to true to allow users to self register for your sever. This is a global
-# setting that must be enabled for the project level options to be effective. If
-# enabled, you must then go into each project you want accessible to self registered
-# users, and which permissiosn you want. Currently only create and view all are
-# available (view own is automatically granted), if you want other permissions, you
-# must grant them using the normal user administration procedures. (type : Boolean)
-allow_self_register=true
-
-# Set to true to allow users to save their login in a cookie on their machine
-# for auto login. Setting this to false will not allow any user on the system
-# to use this feature. (type : Boolean)
-allow_save_login=true
-
-# This parameter sets the class to use for authentication. The class must be resident
-# in the classpath that the ear is loaded in, and extend the
-# org.itracker.services.authentication.PluggableAuthenticator abstract class. (type : String)
-#authenticator_class=com.emation.itracker.authentication.WindowsSSONAuthenticatorADInfo
-
-# From address for email notifications to use
-notification_from_address=itracker@localhost
-
-# From address text for email notifications to use
-notification_from_text=ITracker Notification System
-
-# ReplyTo address for email notifications to use
-notification_replyto_address=itracker@localhost
-
-# SMTP hostname for email notifications to use
-notification_smtp_host=localhost
-
-# SMTP notificate character set. You might need to change this for
-# some locales
-#notification_smtp_charset=UTF-8
-
-# SMTP authentication userid and password if required by
-# your application server
-#notification_smtp_userid=kim...@be...
-#notification_smtp_password=4557436
-
-# All attachments are now stored in the database, but you can still
-# control the maximum size of any one attachment, and the total
-# that can be stored.
-
-# The maximum size of an individual issue attachment in kb.
-max_attachment_size=512
-
-# The maximum total size of all attachments in kb.
-max_total_attachment_size=100000
-
-# Table for CMP for the Component Entity Bean. Needed for search.
-#componentbean_table_name=componentbean
-
-# Table for CMP for the Issue Component Relation. Needed for search.
-#componentbean_rel_table_name=issue_component_rel
-
-# Table for CMP for the Issue Entity Bean. Needed for search.
-#issuebean_table_name=issuebean
-
-# Table for CMP for the IssueHistory Entity Bean. Needed for search.
-#issuehistorybean_table_name=issuehistorybean
-
-# Table for CMP for the Project Entity Bean. Needed for search.
-#projectbean_table_name=projectbean
-
-# Table for CMP for the Version Entity Bean. Needed for search.
-#versionbean_table_name=versionbean
-
-# Table for CMP for the Issue Version Relation. Needed for search.
-#versionbean_rel_table_name=issue_version_rel
-
Modified: itracker/trunk/src/test/resources/configuration.properties
===================================================================
--- itracker/trunk/src/test/resources/configuration.properties 2012-08-31 10:05:14 UTC (rev 2319)
+++ itracker/trunk/src/test/resources/configuration.properties 2012-10-16 12:00:04 UTC (rev 2320)
@@ -2,8 +2,8 @@
### Sample configuration properties file
###
-project=itracker
-version=3.0.0
+project=${project.artifactId}
+version=${project.version}
# In order to affect a particular ITracker deployment, a copy of this file
# can be placed at the root of any directory in the container's classpath.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-08-31 10:05:25
|
Revision: 2319
http://itracker.svn.sourceforge.net/itracker/?rev=2319&view=rev
Author: ranks
Date: 2012-08-31 10:05:14 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
fix for selenium tests jetty dependencies versions
Modified Paths:
--------------
itracker/trunk/pom.xml
Modified: itracker/trunk/pom.xml
===================================================================
--- itracker/trunk/pom.xml 2012-08-30 14:04:49 UTC (rev 2318)
+++ itracker/trunk/pom.xml 2012-08-31 10:05:14 UTC (rev 2319)
@@ -1531,10 +1531,12 @@
<dependency>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
+ <version>${c3p0.version}</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
+ <version>${hsqldb.version}</version>
</dependency>
</dependencies>
</plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-08-30 14:04:58
|
Revision: 2318
http://itracker.svn.sourceforge.net/itracker/?rev=2318&view=rev
Author: ranks
Date: 2012-08-30 14:04:49 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
itracker/trunk/pom.xml
Modified: itracker/trunk/pom.xml
===================================================================
--- itracker/trunk/pom.xml 2012-08-30 14:04:42 UTC (rev 2317)
+++ itracker/trunk/pom.xml 2012-08-30 14:04:49 UTC (rev 2318)
@@ -5,7 +5,7 @@
<artifactId>itracker</artifactId>
<packaging>war</packaging>
<name>itracker</name>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
<url>http://itracker.sourceforge.net/</url>
<properties>
<clover.maven.charset>UTF-8</clover.maven.charset>
@@ -114,10 +114,10 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://itracker.svn.sourceforge.net/svnroot/itracker/itracker/tags/itracker-3.1.0</connection>
- <developerConnection>scm:svn:https://itracker.svn.sourceforge.net/svnroot/itracker/itracker/tags/itracker-3.1.0
+ <connection>scm:svn:https://itracker.svn.sourceforge.net/svnroot/itracker/itracker/trunk/</connection>
+ <developerConnection>scm:svn:https://itracker.svn.sourceforge.net/svnroot/itracker/itracker/trunk/
</developerConnection>
- <url>https://itracker.svn.sourceforge.net/svnroot/%69tracker/itracker/tags/itracker-3.1.0</url>
+ <url>https://itracker.svn.sourceforge.net/svnroot/%69tracker/itracker/trunk/</url>
</scm>
<organization>
<name>itracker</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-08-30 14:04:52
|
Revision: 2317
http://itracker.svn.sourceforge.net/itracker/?rev=2317&view=rev
Author: ranks
Date: 2012-08-30 14:04:42 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
[maven-release-plugin] copy for tag itracker-3.1.0
Added Paths:
-----------
itracker/tags/itracker-3.1.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-08-30 14:04:33
|
Revision: 2316
http://itracker.svn.sourceforge.net/itracker/?rev=2316&view=rev
Author: ranks
Date: 2012-08-30 14:04:24 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
[maven-release-plugin] prepare release itracker-3.1.0
Modified Paths:
--------------
itracker/trunk/pom.xml
Modified: itracker/trunk/pom.xml
===================================================================
--- itracker/trunk/pom.xml 2012-08-30 14:02:10 UTC (rev 2315)
+++ itracker/trunk/pom.xml 2012-08-30 14:04:24 UTC (rev 2316)
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
<groupId>org.itracker</groupId>
<artifactId>itracker</artifactId>
<packaging>war</packaging>
<name>itracker</name>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0</version>
<url>http://itracker.sourceforge.net/</url>
<properties>
<clover.maven.charset>UTF-8</clover.maven.charset>
@@ -14,13 +13,13 @@
<itracker.it.skip>false</itracker.it.skip>
<main.dataSource.jdbcUrl>jdbc:mysql://localhost:3306/itrackerdev</main.dataSource.jdbcUrl>
<main.dataSource.user>root</main.dataSource.user>
- <main.dataSource.password></main.dataSource.password>
+ <main.dataSource.password />
<main.dataSource.driverClass>com.mysql.jdbc.Driver</main.dataSource.driverClass>
<main.hibernate.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</main.hibernate.dialect>
<test.dataSource.jdbcUrl>jdbc:hsqldb:mem:itrackerdev-test</test.dataSource.jdbcUrl>
<test.dataSource.user>sa</test.dataSource.user>
- <test.dataSource.password></test.dataSource.password>
+ <test.dataSource.password />
<test.dataSource.driverClass>org.hsqldb.jdbcDriver</test.dataSource.driverClass>
<test.hibernate.dialect>org.hibernate.dialect.HSQLDialect</test.hibernate.dialect>
@@ -115,10 +114,10 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://itracker.svn.sourceforge.net/svnroot/itracker/itracker/trunk/</connection>
- <developerConnection>scm:svn:https://itracker.svn.sourceforge.net/svnroot/itracker/itracker/trunk/
+ <connection>scm:svn:https://itracker.svn.sourceforge.net/svnroot/itracker/itracker/tags/itracker-3.1.0</connection>
+ <developerConnection>scm:svn:https://itracker.svn.sourceforge.net/svnroot/itracker/itracker/tags/itracker-3.1.0
</developerConnection>
- <url>https://itracker.svn.sourceforge.net/svnroot/%69tracker/itracker/trunk/</url>
+ <url>https://itracker.svn.sourceforge.net/svnroot/%69tracker/itracker/tags/itracker-3.1.0</url>
</scm>
<organization>
<name>itracker</name>
@@ -267,7 +266,7 @@
<exclude>org/itracker/**/*IT.java</exclude>
</excludes>
</instrumentation>
- <check></check>
+ <check />
</configuration>
</plugin>
<!--plugin>
@@ -575,7 +574,7 @@
<releases>
<enabled>false</enabled>
</releases>
- <snapshots/>
+ <snapshots />
<id>apache.org</id>
<name>Maven Snapshots</name>
<url>http://people.apache.org/maven-snapshot-repository</url>
@@ -584,7 +583,7 @@
<releases>
<enabled>false</enabled>
</releases>
- <snapshots/>
+ <snapshots />
<id>codehaus.org</id>
<name>Codehaus Snapshots</name>
<url>http://snapshots.repository.codehaus.org</url>
@@ -907,7 +906,7 @@
<format>html</format>
<format>xml</format>
</formats>
- <check></check>
+ <check />
</configuration>
</plugin>
@@ -1329,13 +1328,13 @@
<main.dataSource.jdbcUrl>jdbc:hsqldb:hsql://localhost:8887/itrackerdev-test</main.dataSource.jdbcUrl>
<main.dataSource.user>sa</main.dataSource.user>
- <main.dataSource.password></main.dataSource.password>
+ <main.dataSource.password />
<main.dataSource.driverClass>org.hsqldb.jdbcDriver</main.dataSource.driverClass>
<main.hibernate.dialect>org.hibernate.dialect.HSQLDialect</main.hibernate.dialect>
<test.dataSource.jdbcUrl>jdbc:hsqldb:hsql://localhost:8887/itrackerdev-test</test.dataSource.jdbcUrl>
<test.dataSource.user>sa</test.dataSource.user>
- <test.dataSource.password></test.dataSource.password>
+ <test.dataSource.password />
<test.dataSource.driverClass>org.hsqldb.jdbcDriver</test.dataSource.driverClass>
<test.hibernate.dialect>org.hibernate.dialect.HSQLDialect</test.hibernate.dialect>
</properties>
@@ -1379,7 +1378,7 @@
</goals>
<configuration>
<tasks unless="maven.test.skip">
- <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+ <property name="plugin_classpath" refid="maven.plugin.classpath" />
<concat destfile="${project.build.directory}/temp.bsh">
<![CDATA[
import java.sql.*;
@@ -1398,21 +1397,19 @@
]]>
</concat>
<java classname="bsh.Interpreter" classpath="${plugin_classpath}">
- <arg line="${project.build.directory}/temp.bsh itrackerdev-test"/>
+ <arg line="${project.build.directory}/temp.bsh itrackerdev-test" />
</java>
<delete failonerror="false">
- <fileset dir="${project.build.directory}" includes="temp.bsh"/>
- <fileset dir="${java.io.tmpdir}/hsqldb"
- includes="itrackerdev-test*"/>
+ <fileset dir="${project.build.directory}" includes="temp.bsh" />
+ <fileset dir="${java.io.tmpdir}/hsqldb" includes="itrackerdev-test*" />
</delete>
- <java fork="true" spawn="true" dir="${java.io.tmpdir}"
- classname="org.hsqldb.Server" classpath="${plugin_classpath}">
- <arg value="-database.0"/>
- <arg value="${java.io.tmpdir}/hsqldb/itrackerdev-test"/>
- <arg value="-dbname.0"/>
- <arg value="itrackerdev-test"/>
- <arg value="-port"/>
- <arg value="8887"/>
+ <java fork="true" spawn="true" dir="${java.io.tmpdir}" classname="org.hsqldb.Server" classpath="${plugin_classpath}">
+ <arg value="-database.0" />
+ <arg value="${java.io.tmpdir}/hsqldb/itrackerdev-test" />
+ <arg value="-dbname.0" />
+ <arg value="itrackerdev-test" />
+ <arg value="-port" />
+ <arg value="8887" />
</java>
</tasks>
</configuration>
@@ -1425,8 +1422,7 @@
</goals>
<configuration>
<tasks>
- <copy overwrite="true" file="${project.build.testOutputDirectory}/log4j.xml"
- todir="${project.build.testOutputDirectory}/"/>
+ <copy overwrite="true" file="${project.build.testOutputDirectory}/log4j.xml" todir="${project.build.testOutputDirectory}/" />
</tasks>
</configuration>
</execution>
@@ -1653,13 +1649,13 @@
<main.dataSource.jdbcUrl>jdbc:mysql://localhost:3306/itrackerdev</main.dataSource.jdbcUrl>
<main.dataSource.user>root</main.dataSource.user>
- <main.dataSource.password></main.dataSource.password>
+ <main.dataSource.password />
<main.dataSource.driverClass>com.mysql.jdbc.Driver</main.dataSource.driverClass>
<main.hibernate.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</main.hibernate.dialect>
<test.dataSource.jdbcUrl>jdbc:mysql://localhost:3306/itrackerdev</test.dataSource.jdbcUrl>
<test.dataSource.user>root</test.dataSource.user>
- <test.dataSource.password></test.dataSource.password>
+ <test.dataSource.password />
<test.dataSource.driverClass>com.mysql.jdbc.Driver</test.dataSource.driverClass>
<test.hibernate.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</test.hibernate.dialect>
</properties>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-08-30 14:02:21
|
Revision: 2315
http://itracker.svn.sourceforge.net/itracker/?rev=2315&view=rev
Author: ranks
Date: 2012-08-30 14:02:10 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
adding release and snapshot repositories for releasing the project from maven
Modified Paths:
--------------
itracker/trunk/pom.xml
Modified: itracker/trunk/pom.xml
===================================================================
--- itracker/trunk/pom.xml 2012-08-30 09:39:18 UTC (rev 2314)
+++ itracker/trunk/pom.xml 2012-08-30 14:02:10 UTC (rev 2315)
@@ -509,7 +509,6 @@
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>${maven-wagon-ssh-plugin.version}</version>
-
</dependency>
</dependencies>
</plugin>
@@ -528,8 +527,15 @@
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
<configuration>
- <skip>true</skip>
+ <skip>false</skip>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>${maven-wagon-ssh-plugin.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
@@ -972,6 +978,17 @@
<id>itracker.website</id>
<url>scp://shell.sourceforge.net/home/project-web/itracker/htdocs</url>
</site>
+
+ <repository>
+ <id>itracker.releases</id>
+ <name>itracker Release Repository</name>
+ <url>scp://shell.sourceforge.net/home/project-web/itracker/htdocs/maven2/releases</url>
+ </repository>
+ <snapshotRepository>
+ <id>itracker.snapshots</id>
+ <name>itracker Release Repository</name>
+ <url>scp://shell.sourceforge.net/home/project-web/itracker/htdocs/maven2/snapshots</url>
+ </snapshotRepository>
</distributionManagement>
<profiles>
<profile>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-08-30 09:39:24
|
Revision: 2314
http://itracker.svn.sourceforge.net/itracker/?rev=2314&view=rev
Author: ranks
Date: 2012-08-30 09:39:18 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
minor cleanup and additional tomcat7 support, run with: mvn package tomcat7:run -Pitracker.tomcat
Modified Paths:
--------------
itracker/trunk/pom.xml
Modified: itracker/trunk/pom.xml
===================================================================
--- itracker/trunk/pom.xml 2012-08-30 08:04:24 UTC (rev 2313)
+++ itracker/trunk/pom.xml 2012-08-30 09:39:18 UTC (rev 2314)
@@ -29,6 +29,8 @@
<hsqldb.version>1.8.0.10</hsqldb.version>
<postgresql.version>9.1-901-1.jdbc4</postgresql.version>
<derby.version>10.9.1.0</derby.version>
+ <mail.version>1.4.4</mail.version>
+ <c3p0.version>0.9.1.2</c3p0.version>
<maven-findbugs-plugin.version>2.4.0</maven-findbugs-plugin.version>
<maven-site-plugin.version>3.0</maven-site-plugin.version>
@@ -617,6 +619,16 @@
<version>${derby.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${mail.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>${c3p0.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
@@ -700,14 +712,6 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -762,7 +766,6 @@
<dependency>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
- <version>0.9.1.2</version>
</dependency>
<dependency>
<groupId>quartz</groupId>
@@ -788,7 +791,6 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -832,10 +834,6 @@
<version>1.5.5</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </dependency>
</dependencies>
<reporting>
@@ -1046,12 +1044,12 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.4</version>
+ <version>${mail.version}</version>
</dependency>
<dependency>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
- <version>0.9.1.2</version>
+ <version>${c3p0.version}</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
@@ -1075,6 +1073,48 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>${maven-tomcat-plugin.version}</version>
+ <configuration>
+ <port>${application.port}</port>
+ <contextFile>${project.build.directory}/tomcat-itracker/context.xml</contextFile>
+
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${mail.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>${c3p0.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>${hsqldb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql-connector-java.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${postgresql.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -1478,12 +1518,10 @@
<dependency>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
- <version>0.9.1.2</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
</dependency>
</dependencies>
</plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-08-30 08:04:34
|
Revision: 2313
http://itracker.svn.sourceforge.net/itracker/?rev=2313&view=rev
Author: ranks
Date: 2012-08-30 08:04:24 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
switching mysql dialect to support mysql 5.x with inno-db
Modified Paths:
--------------
itracker/trunk/pom.xml
Modified: itracker/trunk/pom.xml
===================================================================
--- itracker/trunk/pom.xml 2012-07-27 21:20:46 UTC (rev 2312)
+++ itracker/trunk/pom.xml 2012-08-30 08:04:24 UTC (rev 2313)
@@ -16,7 +16,7 @@
<main.dataSource.user>root</main.dataSource.user>
<main.dataSource.password></main.dataSource.password>
<main.dataSource.driverClass>com.mysql.jdbc.Driver</main.dataSource.driverClass>
- <main.hibernate.dialect>org.hibernate.dialect.MySQLInnoDBDialect</main.hibernate.dialect>
+ <main.hibernate.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</main.hibernate.dialect>
<test.dataSource.jdbcUrl>jdbc:hsqldb:mem:itrackerdev-test</test.dataSource.jdbcUrl>
<test.dataSource.user>sa</test.dataSource.user>
@@ -1600,13 +1600,13 @@
<main.dataSource.user>root</main.dataSource.user>
<main.dataSource.password></main.dataSource.password>
<main.dataSource.driverClass>com.mysql.jdbc.Driver</main.dataSource.driverClass>
- <main.hibernate.dialect>org.hibernate.dialect.MySQLInnoDBDialect</main.hibernate.dialect>
+ <main.hibernate.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</main.hibernate.dialect>
<test.dataSource.jdbcUrl>jdbc:mysql://localhost:3306/itrackerdev</test.dataSource.jdbcUrl>
<test.dataSource.user>root</test.dataSource.user>
<test.dataSource.password></test.dataSource.password>
<test.dataSource.driverClass>com.mysql.jdbc.Driver</test.dataSource.driverClass>
- <test.hibernate.dialect>org.hibernate.dialect.MySQLInnoDBDialect</test.hibernate.dialect>
+ <test.hibernate.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</test.hibernate.dialect>
</properties>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-07-27 21:20:52
|
Revision: 2312
http://itracker.svn.sourceforge.net/itracker/?rev=2312&view=rev
Author: ranks
Date: 2012-07-27 21:20:46 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
removing obsolete repository
Modified Paths:
--------------
itracker/trunk/pom.xml
Modified: itracker/trunk/pom.xml
===================================================================
--- itracker/trunk/pom.xml 2012-07-27 21:08:58 UTC (rev 2311)
+++ itracker/trunk/pom.xml 2012-07-27 21:20:46 UTC (rev 2312)
@@ -1295,7 +1295,7 @@
<scope>test</scope>
</dependency>
</dependencies>
- <repositories>
+ <!--repositories>
<repository>
<id>mortbay-repo</id>
<name>mortbay-repo</name>
@@ -1308,7 +1308,7 @@
<name>mortbay-repo</name>
<url>http://www.mortbay.org/maven2/snapshot</url>
</pluginRepository>
- </pluginRepositories>
+ </pluginRepositories-->
<build>
<plugins>
<plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-07-27 21:09:04
|
Revision: 2311
http://itracker.svn.sourceforge.net/itracker/?rev=2311&view=rev
Author: ranks
Date: 2012-07-27 21:08:58 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
fixing connection acquire exceptions
Modified Paths:
--------------
itracker/trunk/src/test/resources/jetty-env.xconf
Modified: itracker/trunk/src/test/resources/jetty-env.xconf
===================================================================
--- itracker/trunk/src/test/resources/jetty-env.xconf 2012-07-27 20:17:46 UTC (rev 2310)
+++ itracker/trunk/src/test/resources/jetty-env.xconf 2012-07-27 21:08:58 UTC (rev 2311)
@@ -31,7 +31,9 @@
<Set name="jdbcUrl">${main.dataSource.jdbcUrl}</Set>
<Set name="user">${main.dataSource.user}</Set>
<Set name="password">${main.dataSource.password}</Set>
- <Set name="maxPoolSize">20</Set>
+ <Set name="maxPoolSize">100</Set>
+ <Set name="maxIdleTime" >300</Set>
+ <Set name="loginTimeout" >5</Set>
</New>
</Arg>
</New>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-07-27 20:17:52
|
Revision: 2310
http://itracker.svn.sourceforge.net/itracker/?rev=2310&view=rev
Author: ranks
Date: 2012-07-27 20:17:46 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
re-enabling dependency locations in reports
Modified Paths:
--------------
itracker/trunk/pom.xml
Modified: itracker/trunk/pom.xml
===================================================================
--- itracker/trunk/pom.xml 2012-07-27 19:49:03 UTC (rev 2309)
+++ itracker/trunk/pom.xml 2012-07-27 20:17:46 UTC (rev 2310)
@@ -446,7 +446,7 @@
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven-project-info-reports-plugin.version}</version>
<configuration>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ <!--dependencyLocationsEnabled>false</dependencyLocationsEnabled-->
</configuration>
</plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-07-27 19:49:09
|
Revision: 2309
http://itracker.svn.sourceforge.net/itracker/?rev=2309&view=rev
Author: ranks
Date: 2012-07-27 19:49:03 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
re-factorings on testing and site config, encodings cleanup, new site url
Modified Paths:
--------------
itracker/trunk/pom.xml
Modified: itracker/trunk/pom.xml
===================================================================
--- itracker/trunk/pom.xml 2012-07-27 19:42:55 UTC (rev 2308)
+++ itracker/trunk/pom.xml 2012-07-27 19:49:03 UTC (rev 2309)
@@ -10,7 +10,6 @@
<url>http://itracker.sourceforge.net/</url>
<properties>
<clover.maven.charset>UTF-8</clover.maven.charset>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<itracker.it.skip>false</itracker.it.skip>
<main.dataSource.jdbcUrl>jdbc:mysql://localhost:3306/itrackerdev</main.dataSource.jdbcUrl>
@@ -44,11 +43,16 @@
<maven-changes-plugin.version>2.7</maven-changes-plugin.version>
<maven-changelog-plugin.version>2.2</maven-changelog-plugin.version>
<maven-surefire-report-plugin.version>2.12</maven-surefire-report-plugin.version>
- <maven-cobertura-plugin.version>2.0</maven-cobertura-plugin.version>
+ <maven-cobertura-plugin.version>2.5.1</maven-cobertura-plugin.version>
<maven-javadoc-plugin.version>2.8.1</maven-javadoc-plugin.version>
<maven-war-plugin.version>2.1.1</maven-war-plugin.version>
<maven-compiler-plugin.version>2.0.2</maven-compiler-plugin.version>
<maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
+ <maven-wagon-ssh-plugin.version>2.2</maven-wagon-ssh-plugin.version>
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <project.build.outputEncoding>UTF-8</project.build.outputEncoding>
</properties>
<issueManagement>
<system>SourceForge</system>
@@ -172,18 +176,15 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
<executions>
<execution>
- <id>unit-testing</id>
+ <id>default-test</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
- <skip>false</skip>
+ <forkMode>none</forkMode>
<excludes>
<exclude>org/itracker/selenium/**/*.java</exclude>
<exclude>org/itracker/**/*IT.java</exclude>
@@ -193,7 +194,7 @@
</includes>
</configuration>
</execution>
- <execution>
+ <!--execution>
<id>integration-testing</id>
<phase>integration-test</phase>
<goals>
@@ -209,29 +210,84 @@
<include>org/itracker/**/*IT.java</include>
</includes>
</configuration>
- </execution>
+ </execution-->
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.12</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <skipTests>${itracker.it.skip}</skipTests>
+ <skipTs>true</skipTs>
+ <!--forkMode>none</forkMode-->
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>${maven-cobertura-plugin.version}</version>
- <executions>
+ <executions>
<execution>
- <id>clean</id>
+ <id>cobertura-clean</id>
+ <phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
+
<configuration>
+ <!--reportSets>
+ <reportSet>
+ <reports>
+ <report>cobertura-integration</report>
+ </reports>
+ </reportSet>
+ </reportSets-->
+ <formats>
+ <format>html</format>
+ <format>xml</format>
+ </formats>
<instrumentation>
<excludes>
+ <exclude>**/*Test.class</exclude>
<exclude>org/itracker/web/**/*.class</exclude>
+ <exclude>org/itracker/**/*IT.java</exclude>
</excludes>
</instrumentation>
+ <check></check>
</configuration>
</plugin>
+ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-it-maven-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <formats>
+ <format>html</format>
+ </formats>
+ <check>
+ <haltOnFailure>false</haltOnFailure>
+ </check>
+ <instrumentation>
+ <excludes>
+ <exclude>org/itracker/**/*Test.java</exclude>
+ <exclude>org/itracker/**/*IT.java</exclude>
+ <exclude>org/itracker/web/**/*.java</exclude>
+ </excludes>
+ </instrumentation>
+ </configuration>
+ </plugin-->
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
@@ -348,7 +404,8 @@
<configuration>
<instrumentation>
<excludes>
- <exclude>org/itracker/web/**/*.java</exclude>
+ <exclude>**/*Test.class</exclude>
+ <exclude>org/itracker/web/**/*.class</exclude>
</excludes>
</instrumentation>
</configuration>
@@ -384,36 +441,20 @@
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
<configuration>
- <outputEncoding>UTF-8</outputEncoding>
<reportPlugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven-project-info-reports-plugin.version}</version>
<configuration>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${maven-cobertura-plugin.version}</version>
- <configuration>
- <instrumentation>
- <excludes>
- <exclude>org/itracker/**/*Test.java</exclude>
- <exclude>org/itracker/**/*IT.java</exclude>
- <exclude>org/itracker/web/**/*.java</exclude>
- </excludes>
- </instrumentation>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>${maven-pmd-plugin.version}</version>
<configuration>
<targetJdk>1.5</targetJdk>
- <outputEncoding>UTF-8</outputEncoding>
- <sourceEncoding>UTF-8</sourceEncoding>
</configuration>
</plugin>
<plugin>
@@ -439,6 +480,7 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${maven-surefire-report-plugin.version}</version>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -460,6 +502,14 @@
</plugin>
</reportPlugins>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>${maven-wagon-ssh-plugin.version}</version>
+
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
@@ -483,8 +533,6 @@
<artifactId>maven-pmd-plugin</artifactId>
<version>${maven-pmd-plugin.version}</version>
<configuration>
- <outputEncoding>UTF-8</outputEncoding>
- <sourceEncoding>UTF-8</sourceEncoding>
</configuration>
</plugin>
</plugins>
@@ -797,22 +845,41 @@
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven-project-info-reports-plugin.version}</version>
</plugin>
+
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${maven-cobertura-plugin.version}</version>
- <configuration>
- <instrumentation>
- <excludes>
- <exclude>org/itracker/**/*Test.java</exclude>
- <exclude>org/itracker/**/*IT.java</exclude>
- <exclude>org/itracker/web/**/*.java</exclude>
- </excludes>
- </instrumentation>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.12</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.12</version>
+ <reportSets>
+ <reportSet>
+ <id>integration-tests</id>
+ <reports>
+ <report>failsafe-report-only</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.12</version>
+ <reportSets>
+ <reportSet>
+ <id>selenium-tests</id>
+ <reports>
+ <report>failsafe-selenium-report-only</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven-checkstyle-plugin.version}</version>
@@ -827,13 +894,24 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>${maven-cobertura-plugin.version}</version>
+ <configuration>
+ <formats>
+ <format>html</format>
+ <format>xml</format>
+ </formats>
+ <check></check>
+ </configuration>
+ </plugin>
+
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>${maven-pmd-plugin.version}</version>
<configuration>
<targetJdk>1.5</targetJdk>
- <outputEncoding>UTF-8</outputEncoding>
- <sourceEncoding>UTF-8</sourceEncoding>
</configuration>
</plugin>
<plugin>
@@ -885,18 +963,6 @@
<effort>Default</effort>
<encoding>UTF-8</encoding>
<!--Fails:-->
- <!--<pluginList>/libs/fb-contrib/fb-contrib-2.8.0.jar</pluginList>-->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>1.1.1</version>
- <configuration>
- <xmlOutput>false</xmlOutput>
- <xmlOutputDirectory>findbugs</xmlOutputDirectory>
- <threshold>Normal</threshold>
- <effort>Default</effort>
<pluginList>/libs/fb-contrib/fb-contrib-2.8.0.jar</pluginList>
</configuration>
</plugin>
@@ -906,7 +972,7 @@
<distributionManagement>
<site>
<id>itracker.website</id>
- <url>scp://shell.sourceforge.net/home/groups/i/it/itracker/htdocs</url>
+ <url>scp://shell.sourceforge.net/home/project-web/itracker/htdocs</url>
</site>
</distributionManagement>
<profiles>
@@ -1023,7 +1089,7 @@
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <configuration>
+ <configuration>
<reportPlugins>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
@@ -1057,8 +1123,6 @@
<version>${maven-pmd-plugin.version}</version>
<configuration>
<targetJdk>1.5</targetJdk>
- <outputEncoding>UTF-8</outputEncoding>
- <sourceEncoding>UTF-8</sourceEncoding>
</configuration>
</plugin>
<plugin>
@@ -1197,6 +1261,7 @@
<id>selenium</id>
<properties>
+ <!--itracker.it.skip>true</itracker.it.skip-->
<selenium.firefox.binary>firefox</selenium.firefox.binary>
<selenium.host>localhost</selenium.host>
<selenium.port>5555</selenium.port>
@@ -1223,6 +1288,12 @@
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>${maven-jetty-plugin.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<repositories>
<repository>
@@ -1344,7 +1415,7 @@
<debug>true</debug>
<logOutput>true</logOutput>
<logFile>${project.build.directory}/selenium/selenium-plugin.log</logFile>
- <browserSideLog>false</browserSideLog>
+ <browserSideLog>true</browserSideLog>
<ensureCleanSession>false</ensureCleanSession>
</configuration>
</execution>
@@ -1360,7 +1431,6 @@
<stopPort>9966</stopPort>
<stopKey>foo</stopKey>
<systemProperties>
- <!--java.naming.factory.initial=org.eclipse.jetty.jndi.InitialContextFactory-->
<systemProperty>
<name>java.naming.factory.initial</name>
<value>org.eclipse.jetty.jndi.InitialContextFactory</value>
@@ -1420,7 +1490,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skip>true</skip>
+ <!--skip>true</skip-->
</configuration>
<executions>
<execution>
@@ -1430,7 +1500,7 @@
<goal>test</goal>
</goals>
<configuration>
- <skip>false</skip>
+ <!--skip>false</skip-->
<forkMode>none</forkMode>
<includes>
<include>org/itracker/**/*PreTest.java</include>
@@ -1438,7 +1508,7 @@
</includes>
</configuration>
</execution>
- <execution>
+ <!--execution>
<id>selenium-testing</id>
<phase>integration-test</phase>
<goals>
@@ -1455,9 +1525,60 @@
<exclude>org/itracker/selenium/**/*PreTest.java</exclude>
</excludes>
</configuration>
- </execution>
+ </execution-->
</executions>
</plugin>
+
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.12</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <configuration>
+ <!--skipTests>false</skipTests-->
+ <excludes>
+ <exclude>org/itracker/selenium/**/*PreTest.java</exclude>
+ <!--exclude>org/itracker/**/NamingUtilitiesIT.java</exclude-->
+ </excludes>
+ <forkMode>none</forkMode>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>selenium-integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <skipTests>false</skipTests>
+ <skipTs>false</skipTs>
+ <properties>
+ <itracker.it.skip>true</itracker.it.skip>
+ </properties>
+ <!--reportsDirectory>${project.build.directory}/failsafe-selenium-reports</reportsDirectory-->
+ <includes>
+ <include>org/itracker/selenium/**/*.java</include>
+ </includes>
+ <excludes>
+ <exclude>org/itracker/selenium/**/*PreTest.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>${maven-jetty-plugin.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
</plugins>
</build>
</profile>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-07-27 19:43:01
|
Revision: 2308
http://itracker.svn.sourceforge.net/itracker/?rev=2308&view=rev
Author: ranks
Date: 2012-07-27 19:42:55 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
optimizing development guide
Modified Paths:
--------------
itracker/trunk/src/site/apt/development_environment_setup.apt
Modified: itracker/trunk/src/site/apt/development_environment_setup.apt
===================================================================
--- itracker/trunk/src/site/apt/development_environment_setup.apt 2012-07-21 15:59:07 UTC (rev 2307)
+++ itracker/trunk/src/site/apt/development_environment_setup.apt 2012-07-27 19:42:55 UTC (rev 2308)
@@ -10,23 +10,17 @@
This guide explains how to use Maven in Eclipse, IDEA and NetBeans.
- * {{{#Eclipse}Eclipse}}
+%{toc}
- * {{{#IDEA}IDEA}}
-
- * {{{#NetBeans}NetBeans}}
-
- * {{{#Tomcat}Tomcat integration}}
-
* {Eclipse}
** {using maven integration plugin for eclipse}
This will not work for older Eclipse versions (pre 3.4 Ganymede).\
- Install the eclipse-plugin 'Eclipse Maven Integration' from update site {{http://m2eclipse.codehaus.org/update/}}.\
+ Install the eclipse-plugin 'Eclipse Maven Integration' from eclipse marketplace site {{http://marketplace.eclipse.org}}.\
Check out itracker from SVN, usually trunk-version.\
Import the checked out project using maven import-wizzard: File > Import ... > General > Maven Projects\
- More information: {{http://m2eclipse.codehaus.org/}}
+ More information: {{http://marketplace.eclipse.org/content/maven-integration-eclipse/}}
** {maven generated (<old path>)}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-07-21 15:59:13
|
Revision: 2307
http://itracker.svn.sourceforge.net/itracker/?rev=2307&view=rev
Author: ranks
Date: 2012-07-21 15:59:07 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
adding site skin images
Added Paths:
-----------
itracker-skin/trunk/src/main/resources/images/icon_success_sml.gif
Added: itracker-skin/trunk/src/main/resources/images/icon_success_sml.gif
===================================================================
(Binary files differ)
Property changes on: itracker-skin/trunk/src/main/resources/images/icon_success_sml.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-07-21 14:49:43
|
Revision: 2306
http://itracker.svn.sourceforge.net/itracker/?rev=2306&view=rev
Author: ranks
Date: 2012-07-21 14:49:37 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
adding site skin images
Added Paths:
-----------
itracker-skin/trunk/src/main/resources/images/icon_error_sml.gif
itracker-skin/trunk/src/main/resources/images/icon_info_sml.gif
itracker-skin/trunk/src/main/resources/images/icon_warning_sml.gif
Added: itracker-skin/trunk/src/main/resources/images/icon_error_sml.gif
===================================================================
(Binary files differ)
Property changes on: itracker-skin/trunk/src/main/resources/images/icon_error_sml.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: itracker-skin/trunk/src/main/resources/images/icon_info_sml.gif
===================================================================
(Binary files differ)
Property changes on: itracker-skin/trunk/src/main/resources/images/icon_info_sml.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: itracker-skin/trunk/src/main/resources/images/icon_warning_sml.gif
===================================================================
(Binary files differ)
Property changes on: itracker-skin/trunk/src/main/resources/images/icon_warning_sml.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-07-21 10:17:30
|
Revision: 2305
http://itracker.svn.sourceforge.net/itracker/?rev=2305&view=rev
Author: ranks
Date: 2012-07-21 10:17:24 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
fixing site maven-project-info-reports generation
Modified Paths:
--------------
itracker/trunk/pom.xml
Modified: itracker/trunk/pom.xml
===================================================================
--- itracker/trunk/pom.xml 2012-07-21 07:39:33 UTC (rev 2304)
+++ itracker/trunk/pom.xml 2012-07-21 10:17:24 UTC (rev 2305)
@@ -33,7 +33,7 @@
<maven-findbugs-plugin.version>2.4.0</maven-findbugs-plugin.version>
<maven-site-plugin.version>3.0</maven-site-plugin.version>
-
+ <maven-project-info-reports-plugin.version>2.4</maven-project-info-reports-plugin.version>
<maven-tomcat-plugin.version>2.0-beta-1</maven-tomcat-plugin.version>
<maven-clover-plugin.version>3.7</maven-clover-plugin.version>
<maven-pmd-plugin.version>2.7.1</maven-pmd-plugin.version>
@@ -386,11 +386,12 @@
<configuration>
<outputEncoding>UTF-8</outputEncoding>
<reportPlugins>
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-project-info-reports-plugin</artifactId>-->
- <!--<version>2.4</version>-->
- <!--</plugin>-->
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${maven-project-info-reports-plugin.version}</version>
+ <configuration>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -793,6 +794,10 @@
<plugins>
<plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${maven-project-info-reports-plugin.version}</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>${maven-cobertura-plugin.version}</version>
@@ -1043,12 +1048,11 @@
</configuration>
</plugin>
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-project-info-reports-plugin</artifactId>-->
- <!--<version>2.4</version>-->
- <!--</plugin>-->
<plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${maven-project-info-reports-plugin.version}</version>
+ </plugin>
+ <plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>${maven-pmd-plugin.version}</version>
<configuration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2012-07-21 07:39:39
|
Revision: 2304
http://itracker.svn.sourceforge.net/itracker/?rev=2304&view=rev
Author: ranks
Date: 2012-07-21 07:39:33 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
fixing hsql versions, selenium dependencies
Modified Paths:
--------------
itracker/trunk/pom.xml
Modified: itracker/trunk/pom.xml
===================================================================
--- itracker/trunk/pom.xml 2012-07-21 07:12:25 UTC (rev 2303)
+++ itracker/trunk/pom.xml 2012-07-21 07:39:33 UTC (rev 2304)
@@ -707,7 +707,7 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.10</version>
+ <version>${hsqldb.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1217,7 +1217,7 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
+ <version>${hsqldb.version}</version>
</dependency>
</dependencies>
<repositories>
@@ -1313,7 +1313,7 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
+ <version>${hsqldb.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -1400,7 +1400,7 @@
</goals>
</execution>
</executions>
- <!--dependencies>
+ <dependencies>
<dependency>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
@@ -1409,9 +1409,9 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
+ <version>${hsqldb.version}</version>
</dependency>
- </dependencies-->
+ </dependencies>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|