You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2011/12/16 14:13:11 UTC
svn commit: r1215120 [1/2] - in /archiva/trunk: archiva-cli/
archiva-docs/src/site/ archiva-docs/src/site/apt/adminguide/
archiva-jetty/src/main/conf/
archiva-modules/archiva-base/archiva-configuration/src/main/mdo/
archiva-modules/archiva-base/archiva...
Author: brett
Date: Fri Dec 16 13:13:10 2011
New Revision: 1215120
URL: http://svn.apache.org/viewvc?rev=1215120&view=rev
Log:
remove all tab characters and fix some formatting
Modified:
archiva/trunk/archiva-cli/pom.xml
archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories.apt
archiva/trunk/archiva-docs/src/site/site.xml
archiva/trunk/archiva-jetty/src/main/conf/jetty.xml
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/web/startup/Banner.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LegacySupportTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/NetworkProxiesTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/mapper/RepositoryActionMapper.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-mime-types.txt
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/deleteArtifactForm.jspf
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/resources/org/apache/archiva/webdav/util/mime.types
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/archiva-mime-types.txt
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml
Modified: archiva/trunk/archiva-cli/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-cli/pom.xml?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-cli/pom.xml (original)
+++ archiva/trunk/archiva-cli/pom.xml Fri Dec 16 13:13:10 2011
@@ -110,7 +110,7 @@
</transformers>
<artifactSet>
<excludes>
- <exclude>xerces:xercesImpl</exclude>
+ <exclude>xerces:xercesImpl</exclude>
<exclude>xml-apis:xml-apis</exclude>
<exclude>xalan:xalan</exclude>
<exclude>commons-beanutils:commons-beanutils</exclude>
Modified: archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories.apt
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories.apt?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories.apt (original)
+++ archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories.apt Fri Dec 16 13:13:10 2011
@@ -31,133 +31,170 @@ Understanding Repository Configuration o
~~TODO: revise more as suggested by Jeff in the dev list
- Archiva has two types of repository configuration: managed repository and remote repository.
-
+ Archiva has two types of repository configuration: managed repository and
+ remote repository.
+
* Managed Repository
- A managed repository is a repository which resides locally to the server where Archiva is running. It could serve as a
- proxy repository, an internal deployment repository or a local mirror repository.
-
- Managed repository fields:
-
+ A managed repository is a repository which resides locally to the server where
+ Archiva is running. It could serve as a proxy repository, an internal deployment
+ repository or a local mirror repository.
+
+ Managed repository fields:
+
* <identifier> - the id of the repository. This must be unique.
-
+
* <name> - the name of the repository.
-
- * <directory> - the location of the repository. If the path specified does not exist, Archiva will create the missing
- directories.
-
- * <index directory> - the location of the index files generated by Archiva. If no location is specified, then the index directory
- (named <<<.indexer>>>) will be created at the root of the repository directory. Another directory named <<<.index>>> is also created
- at the root of the repository directory. This is not configurable though as it contains the packaged/bundled index which is consumed
- by different consumers of the index such as M2Eclipse.
-
+
+ * <directory> - the location of the repository. If the path specified does not
+ exist, Archiva will create the missing directories.
+
+ * <index directory> - the location of the index files generated by Archiva. If
+ no location is specified, then the index directory (named <<<.indexer>>>)
+ will be created at the root of the repository directory. Another directory
+ named <<<.index>>> is also created at the root of the repository directory.
+ This is not configurable though as it contains the packaged/bundled index
+ which is consumed by different consumers of the index such as M2Eclipse.
+
* <type> - the repository layout (maven 2 or maven 1)
-
- * <cron> - the {{{http://quartz.sourceforge.net/javadoc/org/quartz/CronTrigger.html}cron schedule}} when repository scanning will be executed.
-
- * <repository purge by days older> - the first option for repository purge. Archiva will check how old the artifact is
- and if it is older than the set number of days in this field, then the artifact will be deleted respecting the retention
- count (see #7) of course. In order to disable the purge by number of days old and set Archiva to purge by retention count, just set the
- repository purge field to 0. The maximum number of days which can be set here is 1000. See the Repository Purge section
- below for more details.
-
- * <repository purge by retention count> - the second option for repository purge. When running the repository purge, Archiva
- will retain only the number of artifacts set for this field for a specific snapshot version. See the Repository Purge section
- below for more details.
-
- * <releases included> - specifies whether there are released artifacts in the repository.
-
- * <block re-deployment of released artifacts> - specifies whether released artifacts that are already existing in the repository can be overwritten.
- Note that this only take effects for non-snapshot deployments.
-
- * <snapshots included> - specifies whether there are snapshot artifacts in the repository.
-
- * <scannable> - specifies whether the repository can be scanned, meaning it is a local repository which can be indexed, browsed,
- purged, etc.
-
- * <delete released snapshots> - specifies whether to remove those snapshot artifacts which already has release versions
- of it in the repository during repository purge.
-
+
+ * <cron> - the
+ {{{http://quartz.sourceforge.net/javadoc/org/quartz/CronTrigger.html}cron
+ schedule}} when repository scanning will be executed.
+
+ * <repository purge by days older> - the first option for repository purge.
+ Archiva will check how old the artifact is and if it is older than the set
+ number of days in this field, then the artifact will be deleted respecting
+ the retention count (see #7) of course. In order to disable the purge by
+ number of days old and set Archiva to purge by retention count, just set the
+ repository purge field to 0. The maximum number of days which can be set
+ here is 1000. See the Repository Purge section below for more details.
+
+ * <repository purge by retention count> - the second option for repository
+ purge. When running the repository purge, Archiva will retain only the
+ number of artifacts set for this field for a specific snapshot version. See
+ the Repository Purge section below for more details.
+
+ * <releases included> - specifies whether there are released artifacts in the
+ repository.
+
+ * <block re-deployment of released artifacts> - specifies whether released
+ artifacts that are already existing in the repository can be overwritten.
+ Note that this only take effects for non-snapshot deployments.
+
+ * <snapshots included> - specifies whether there are snapshot artifacts in the
+ repository.
+
+ * <scannable> - specifies whether the repository can be scanned, meaning it is
+ a local repository which can be indexed, browsed, purged, etc.
+
+ * <delete released snapshots> - specifies whether to remove those snapshot
+ artifacts which already has release versions of it in the repository during
+ repository purge.
+
[]
-
- Each repository has its own Webdav url. This allows the user to browse and access the repository via webdav. The url has the
- following format:
-
-+----+
+
+ Each repository has its own Webdav url. This allows the user to browse and
+ access the repository via webdav. The url has the following format:
+
++----+
http://[URL TO ARCHIVA]/repository/[REPOSITORY ID] (e.g. http://localhost:8080/archiva/repository/releases).
+----+
- A pom snippet is also available for each repository. The \<distributionManagement\> section can be copied and pasted into a
- project's pom to specify that the project will be deployed in that managed repository. The \<repositories\> section on the
- other hand, can be copied and pasted to a project's pom.xml or to Maven's settings.xml to tell Maven to get artifacts
- from the managed repository when building the project.
-
+ A pom snippet is also available for each repository. The
+ \<distributionManagement\> section can be copied and pasted into a project's
+ pom to specify that the project will be deployed in that managed repository.
+ The \<repositories\> section on the other hand, can be copied and pasted to a
+ project's pom.xml or to Maven's settings.xml to tell Maven to get artifacts
+ from the managed repository when building the project.
+
* Remote Repository
- A remote repository is a repository which resides remotely. These repositories are usually the proxied repositories. See
- Proxy Connectors on how to proxy a repository.
+ A remote repository is a repository which resides remotely. These repositories
+ are usually the proxied repositories. See Proxy Connectors on how to proxy a
+ repository.
+
+ Remote repository fields:
- Remote repository fields:
-
* <identifier> - the id of the remote repository.
-
+
* <name> - the name of the remote repository.
-
- * <url> - the url of the remote repository. It is also possible to use a 'file://' url to proxy a local repository. Be careful that if this local repository is a managed repository of archiva which has some proxies connectors, those ones won't be triggered.
-
- * <username> - the username (if authentication is needed) to be used to access the repository.
-
- * <password> - the password (if authentication is needed) to be used to access the repository.
-
- * <type> - the layout (maven 2 or maven 1) of the remote repository.
- * <Activate download remote index> - to activate downloading remote index to add available remote artifacts in search queries.
+ * <url> - the url of the remote repository. It is also possible to use a
+ 'file://' url to proxy a local repository. Be careful that if this local
+ repository is a managed repository of archiva which has some proxies
+ connectors, those ones won't be triggered.
- * <Remote index url, can be relative to url> - path of the remote index directory.
+ * <username> - the username (if authentication is needed) to be used to access
+ the repository.
- * <Cron expression> - cron expression for downloading remote index (default weekly on sunday)
+ * <password> - the password (if authentication is needed) to be used to access
+ the repository.
- * <Directory index storage> - path to store index directory, default will be ${appserver.base}/data/remotes/${repositoryId}/.index
+ * <type> - the layout (maven 2 or maven 1) of the remote repository.
- * <Download Remote Index Timeout in seconds> - read time out for downloading remote index files (default 300)
+ * <Activate download remote index> - to activate downloading remote index to
+ add available remote artifacts in search queries.
- * <Network Proxy to Use for download Remote Index> - proxy to use for downloading remote index files.
+ * <Remote index url, can be relative to url> - path of the remote index
+ directory.
+ * <Cron expression> - cron expression for downloading remote index (default
+ weekly on sunday)
+ * <Directory index storage> - path to store index directory, default will be
+ ${appserver.base}/data/remotes/${repositoryId}/.index
+
+ * <Download Remote Index Timeout in seconds> - read time out for downloading
+ remote index files (default 300)
+
+ * <Network Proxy to Use for download Remote Index> - proxy to use for
+ downloading remote index files.
[../images/remote-repositories.png] Remote Repositories
You can also trigger an immediate download of remote index files.
-
+
* Scanning a Repository
-
- Repository scan can be executed on schedule or it can be explicitly executed by clicking the 'Scan Repository Now' button in
- the repositories page. By default, Archiva only processes new artifacts in the repository with respect to the last run of the
- repository scanner. Meaning that if the artifact's last modified date is newer than the last repository scan, then the artifact
- will be processed. Otherwise, it will be skipped. You can override this behavior and force Archiva to process all artifacts regardless
- of its age by ticking the 'Process All Artifacts' checkbox in the repositories page and clicking the 'Scan Repository Now' button.
+
+ Repository scan can be executed on schedule or it can be explicitly executed
+ by clicking the 'Scan Repository Now' button in the repositories page. By
+ default, Archiva only processes new artifacts in the repository with respect
+ to the last run of the repository scanner. Meaning that if the artifact's last
+ modified date is newer than the last repository scan, then the artifact will
+ be processed. Otherwise, it will be skipped. You can override this behavior
+ and force Archiva to process all artifacts regardless of its age by ticking
+ the 'Process All Artifacts' checkbox in the repositories page and clicking the
+ 'Scan Repository Now' button.
[../images/repositories.png] Repositories
- For every artifact found by the repository scanner, processing is done on this artifact by different
- consumers. Examples of the processing done are: indexing, repository purge and database update. Details about consumers are
- available in the {{{./consumers.html} Consumers}} page.
+ For every artifact found by the repository scanner, processing is done on this
+ artifact by different consumers. Examples of the processing done are: indexing,
+ repository purge and database update. Details about consumers are available in
+ the {{{./consumers.html} Consumers}} page.
* Repository Purge
- Repository purge is the process of cleaning up the repository of old snapshots. When deploying a snapshot to a repository,
- Maven deploys the project/artifact with a timestamped version. Doing daily/nightly builds of the project then tends to bloat
- the repository. What if the artifact is large? Then disk space will definitely be a problem. That's where Archiva's repository
- purge feature comes in. Given a criteria to use -- by the number of days old and by retention count, it would clean up the
- repository by removing old snapshots.
-
- Please take note that the by number of days old criteria is activated by default (set to 100 days). In order to de-activate it and
- use the by retention count criteria, you must set the Repository Purge By Days Older field to 0. Another thing to note here is that
- if the by number of days old criteria is activated, the retention count would still be respected (See the Repository Purge By Days Older
- section below for more details) but not the other way around.
-
- Let's take a look at different behaviours for repository purge using the following scenario:
+ Repository purge is the process of cleaning up the repository of old
+ snapshots. When deploying a snapshot to a repository, Maven deploys the
+ project/artifact with a timestamped version. Doing daily/nightly builds of the
+ project then tends to bloat the repository. What if the artifact is large?
+ Then disk space will definitely be a problem. That's where Archiva's
+ repository purge feature comes in. Given a criteria to use -- by the number of
+ days old and by retention count, it would clean up the repository by removing
+ old snapshots.
+
+ Please take note that the by number of days old criteria is activated by
+ default (set to 100 days). In order to de-activate it and use the by retention
+ count criteria, you must set the Repository Purge By Days Older field to 0.
+ Another thing to note here is that if the by number of days old criteria is
+ activated, the retention count would still be respected (See the Repository
+ Purge By Days Older section below for more details) but not the other way
+ around.
+
+ Let's take a look at different behaviours for repository purge using the
+ following scenario:
+----+
Artifacts in the repository:
@@ -169,48 +206,61 @@ Artifacts in the repository:
../artifact-x/2.0-SNAPSHOT/artifact-x-20070203.028902-4.jar
../artifact-x/2.0-SNAPSHOT/artifact-x-20070203.028902-4.pom
+----+
-
+
[[1]] Repository Purge By Number of Days Older
-
- Using this criteria for the purge, Archiva will check how old an artifact is and if it is older than the set value in the
- repository purge by days older field, then the artifact will be deleted respecting the retention count of course.
-
- If repository purge by days older is set to 100 days (with repository purge by retention count field set to 1),
- and the current date is let's say 03-01-2007, given the scenario above.. the following artifacts will be retained:
- artifact-x-20070113.034619-3.jar, artifact-x-20070113.034619-3.pom, artifact-x-20070203.028902-4.jar and
- artifact-x-20070203.028902-4.pom. It is clear in the version timestamps that these 4 artifacts are not more than
- 100 days old from the current date (which is 03-01-2007 in our example) so they are all retained. In this case
- the retention count doesn't have any effect since the priority is the age of the artifact.
-
- Now, if the repository purge by days older is set to 30 days (with repository purge by retention count field still
- set to 1) and the current date is still 03-01-2007, then given the same scenario above.. only the following artifacts
- will be retained: artifact-x-20070203.028902-4.jar and artifact-x-20070203.028902-4.pom. In this case, we can see
- that the retained artifacts are still not older by the number of days set in the repository purge by days older field
- and the retention count is still met.
-
- Now, let's set the repository purge by days older to 10 days (with repository purge by retention count field still
- set to 1) and the current date is still 03-01-2007, then still given the same repository contents above.. the
- following artifacts will still be retained: artifact-x-20070203.028902-4.jar and artifact-x-20070203.028902-4.pom.
- It is clear from the version timestamps that the artifacts ARE MORE THAN the repository purge by days older value,
- which is 10 days. Why is it still retained? Recall the value of the repository purge by retention count -- 1 :)
- This ensures that there is ALWAYS 1 artifact timestamped version retained for every unique version snapshot directory
- of an artifact.
-
+
+ Using this criteria for the purge, Archiva will check how old an artifact is
+ and if it is older than the set value in the repository purge by days older
+ field, then the artifact will be deleted respecting the retention count of
+ course.
+
+ If repository purge by days older is set to 100 days (with repository purge by
+ retention count field set to 1), and the current date is let's say 03-01-2007,
+ given the scenario above.. the following artifacts will be retained:
+ artifact-x-20070113.034619-3.jar, artifact-x-20070113.034619-3.pom,
+ artifact-x-20070203.028902-4.jar and artifact-x-20070203.028902-4.pom. It is
+ clear in the version timestamps that these 4 artifacts are not more than 100
+ days old from the current date (which is 03-01-2007 in our example) so they are
+ all retained. In this case the retention count doesn't have any effect since the
+ priority is the age of the artifact.
+
+ Now, if the repository purge by days older is set to 30 days (with repository
+ purge by retention count field still set to 1) and the current date is still
+ 03-01-2007, then given the same scenario above.. only the following artifacts
+ will be retained: artifact-x-20070203.028902-4.jar and
+ artifact-x-20070203.028902-4.pom. In this case, we can see that the retained
+ artifacts are still not older by the number of days set in the repository purge
+ by days older field and the retention count is still met.
+
+ Now, let's set the repository purge by days older to 10 days (with repository
+ purge by retention count field still set to 1) and the current date is still
+ 03-01-2007, then still given the same repository contents above.. the following
+ artifacts will still be retained: artifact-x-20070203.028902-4.jar and
+ artifact-x-20070203.028902-4.pom. It is clear from the version timestamps that
+ the artifacts ARE MORE THAN the repository purge by days older value, which is
+ 10 days. Why is it still retained? Recall the value of the repository purge by
+ retention count -- 1 :) This ensures that there is ALWAYS 1 artifact timestamped
+ version retained for every unique version snapshot directory of an artifact.
+
[[2]] Repository Purge By Retention Count
-
- If the repository purge by retention count field is set to 2, then only the artifacts artifact-x-20070113.034619-3.jar,
- artifact-x-20070113.034619-3.pom, artifact-x-20070203.028902-4.jar and artifact-x-20070203.028902-4.pom will be retained
- in the repository. The oldest snapshots will be deleted maintaining only a number of snapshots equivalent to the set
- retention count (regardless of how old or new the artifact is).
+
+ If the repository purge by retention count field is set to 2, then only the
+ artifacts artifact-x-20070113.034619-3.jar, artifact-x-20070113.034619-3.pom,
+ artifact-x-20070203.028902-4.jar and artifact-x-20070203.028902-4.pom will be
+ retained in the repository. The oldest snapshots will be deleted maintaining
+ only a number of snapshots equivalent to the set retention count (regardless of
+ how old or new the artifact is).
** Deleting Released Snapshots
- You can also configure Archiva to clean up snapshot artifacts that have already been released. This can be done by ticking
- the Delete Released Snapshots checkbox in the Repository Configuration form.
+ You can also configure Archiva to clean up snapshot artifacts that have
+ already been released. This can be done by ticking the Delete Released Snapshots
+ checkbox in the Repository Configuration form.
+
+ Once this feature is enabled, if Archiva encounters a snapshot artifact during
+ repository scanning, it would check <<all>> the repositories configured for a
+ released version of that snapshot. If it finds one, then it would delete the
+ entire snapshot version directory.
- Once this feature is enabled, if Archiva encounters a snapshot artifact during repository scanning, it would check <<all>> the
- repositories configured for a released version of that snapshot. If it finds one, then it would delete the entire
- snapshot version directory.
-
- It should be noted that this feature is entirely separate from the repository purge by number of days older and by
- retention count.
+ It should be noted that this feature is entirely separate from the repository
+ purge by number of days older and by retention count.
Modified: archiva/trunk/archiva-docs/src/site/site.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/site.xml?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/src/site/site.xml (original)
+++ archiva/trunk/archiva-docs/src/site/site.xml Fri Dec 16 13:13:10 2011
@@ -50,7 +50,7 @@
<item name="Browsing" href="/userguide/browsing.html" />
<item name="Searching" href="/userguide/searching.html" />
<item name="Identifying an Artifact" href="/userguide/find-artifact.html" />
- <item name="Deleting an Artifact" href="/userguide/delete-artifact.html" />
+ <item name="Deleting an Artifact" href="/userguide/delete-artifact.html" />
<item name="Using as a repository" href="/userguide/using-repository.html" />
<item name="Deploying to repository" href="/userguide/deploy.html" />
<item name="Configuring Virtual Repositories" href="/userguide/virtual-repositories.html" />
Modified: archiva/trunk/archiva-jetty/src/main/conf/jetty.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/src/main/conf/jetty.xml?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/src/main/conf/jetty.xml (original)
+++ archiva/trunk/archiva-jetty/src/main/conf/jetty.xml Fri Dec 16 13:13:10 2011
@@ -67,8 +67,8 @@
<Set name="Acceptors">2</Set>
<Set name="statsOn">false</Set>
<Set name="confidentialPort">8443</Set>
- <Set name="lowResourcesConnections">5000</Set>
- <Set name="lowResourcesMaxIdleTime">5000</Set>
+ <Set name="lowResourcesConnections">5000</Set>
+ <Set name="lowResourcesMaxIdleTime">5000</Set>
</New>
</Arg>
</Call>
@@ -162,9 +162,9 @@
<New class="org.eclipse.jetty.deploy.WebAppDeployer">
<Set name="contexts"><Ref id="Contexts"/></Set>
<Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/apps</Set>
- <Set name="parentLoaderPriority">false</Set>
- <Set name="extract">true</Set>
- <Set name="allowDuplicates">false</Set>
+ <Set name="parentLoaderPriority">false</Set>
+ <Set name="extract">true</Set>
+ <Set name="allowDuplicates">false</Set>
</New>
</Arg>
</Call>
@@ -271,7 +271,7 @@
</Array>
<!-- ARCHIVA CONFIG -->
-
+
<New id="validation_mail" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg>mail/Session</Arg>
<Arg>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo Fri Dec 16 13:13:10 2011
@@ -230,10 +230,10 @@
}
private java.util.Map<String, java.util.List<String>> groupToRepositoryMap;
-
+
public java.util.Map<String, java.util.List<String>> getGroupToRepositoryMap()
{
- if ( repositoryGroups != null && managedRepositories != null )
+ if ( repositoryGroups != null && managedRepositories != null )
{
java.util.Map<String, java.util.List<String>> map = new java.util.HashMap<String, java.util.List<String>>();
@@ -701,23 +701,23 @@
public String getGroupId()
{
return artifact.split( ":" )[0];
- }
+ }
public String getArtifactId()
{
return artifact.split( ":" )[1];
- }
+ }
public String getVersion()
{
return artifact.split( ":" )[2];
- }
+ }
public String getClassifier()
{
- String classifier = artifact.split( ":" )[3];
+ String classifier = artifact.split( ":" )[3];
return classifier.length() > 0 ? classifier : null;
- }
+ }
public String getType()
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java Fri Dec 16 13:13:10 2011
@@ -101,16 +101,16 @@ public class WagonDelegate
{
return delegate.supportsDirectoryCopy();
}
-
+
public void setTimeout(int val)
{
- // ignore
+ // ignore
}
public int getTimeout()
{
return 0;
- }
+ }
public Repository getRepository()
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml Fri Dec 16 13:13:10 2011
@@ -18,7 +18,7 @@
-->
<metadata>
- <groupId>org.apache.maven.test</groupId>
- <artifactId>get-default-metadata</artifactId>
- <version>1.0</version>
-</metadata>
\ No newline at end of file
+ <groupId>org.apache.maven.test</groupId>
+ <artifactId>get-default-metadata</artifactId>
+ <version>1.0</version>
+</metadata>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java Fri Dec 16 13:13:10 2011
@@ -345,13 +345,13 @@ public abstract class AbstractLegacyRepo
assertLayout( path, groupId, artifactId, version, null, type );
}
- /**
- * [MRM-768] Artifact type "maven-plugin" does not distinguish maven1 and maven2 plugins.
- * This produces conflicts when m2 plugins are stored in legacy-layout repository
- */
+ /**
+ * [MRM-768] Artifact type "maven-plugin" does not distinguish maven1 and maven2 plugins.
+ * This produces conflicts when m2 plugins are stored in legacy-layout repository
+ */
@Test
- public void testMaven1Maven2PluginTypeDistinc()
- throws Exception
+ public void testMaven1Maven2PluginTypeDistinc()
+ throws Exception
{
String groupId = "com.sun.tools.xjc.maven2";
String artifactId = "maven-jaxb-plugin";
@@ -360,8 +360,8 @@ public abstract class AbstractLegacyRepo
String path = "com.sun.tools.xjc.maven2/maven-plugins/maven-jaxb-plugin-1.1.jar";
assertLayout( path, groupId, artifactId, version, null, type );
- }
-
+ }
+
/**
* Perform a roundtrip through the layout routines to determine success.
* @param classifier TODO
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/web/startup/Banner.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/web/startup/Banner.java?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/web/startup/Banner.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/web/startup/Banner.java Fri Dec 16 13:13:10 2011
@@ -224,6 +224,6 @@ public class Banner
public static void display( String version )
{
String banner = getBanner( version );
- LoggerFactory.getLogger( Banner.class ).info( StringUtils.repeat( "_", 25 ) + eol + banner );
+ LoggerFactory.getLogger( Banner.class ).info( StringUtils.repeat( "_", 25 ) + eol + banner );
}
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml Fri Dec 16 13:13:10 2011
@@ -44,118 +44,117 @@
</init-param>
</filter>
- <filter-mapping>
- <filter-name>encodingFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
+ <filter-mapping>
+ <filter-name>encodingFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
<listener>
- <listener-class>
- org.springframework.web.context.ContextLoaderListener
- </listener-class>
- </listener>
- <listener>
- <!-- TODO: some Spring technique for this? -->
- <listener-class>
- org.apache.archiva.web.startup.ArchivaStartup
- </listener-class>
- </listener>
-
- <listener>
- <listener-class>net.sf.ehcache.constructs.web.ShutdownListener</listener-class>
- </listener>
-
- <!-- to cleanup temporary group index created during a session -->
- <listener>
- <listener-class>org.apache.archiva.webdav.util.TemporaryGroupIndexSessionCleaner</listener-class>
- </listener>
+ <listener-class>
+ org.springframework.web.context.ContextLoaderListener
+ </listener-class>
+ </listener>
+ <listener>
+ <!-- TODO: some Spring technique for this? -->
+ <listener-class>
+ org.apache.archiva.web.startup.ArchivaStartup
+ </listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>net.sf.ehcache.constructs.web.ShutdownListener</listener-class>
+ </listener>
+
+ <!-- to cleanup temporary group index created during a session -->
+ <listener>
+ <listener-class>org.apache.archiva.webdav.util.TemporaryGroupIndexSessionCleaner</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>RepositoryServlet</servlet-name>
+ <servlet-class>
+ org.apache.archiva.webdav.RepositoryServlet
+ </servlet-class>
+ <!-- Loading this on startup so as to take advantage of configuration listeners -->
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>XmlRpcServlet</servlet-name>
+ <servlet-class>
+ com.atlassian.xmlrpc.spring.BinderSpringXmlRpcServlet
+ </servlet-class>
+ <init-param>
+ <param-name>serviceListBeanName</param-name>
+ <param-value>xmlrpcServicesList</param-value>
+ </init-param>
+ <init-param>
+ <param-name>authHandlerBeanName</param-name>
+ <param-value>xmlRpcAuthenticator</param-value>
+ </init-param>
+ <init-param>
+ <param-name>enabledForExtensions</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>RedbackXmlRpcServlet</servlet-name>
+ <servlet-class>com.atlassian.xmlrpc.spring.BinderSpringXmlRpcServlet</servlet-class>
+ <init-param>
+ <param-name>serviceListBeanName</param-name>
+ <param-value>redbackXmlrpcServicesList</param-value>
+ </init-param>
+ <init-param>
+ <param-name>authHandlerBeanName</param-name>
+ <param-value>redbackXmlRpcAuthenticator</param-value>
+ </init-param>
+ <init-param>
+ <param-name>enabledForExtensions</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ </servlet>
<servlet>
- <servlet-name>RepositoryServlet</servlet-name>
- <servlet-class>
- org.apache.archiva.webdav.RepositoryServlet
- </servlet-class>
- <!-- Loading this on startup so as to take advantage of configuration listeners -->
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>XmlRpcServlet</servlet-name>
- <servlet-class>
- com.atlassian.xmlrpc.spring.BinderSpringXmlRpcServlet
- </servlet-class>
- <init-param>
- <param-name>serviceListBeanName</param-name>
- <param-value>xmlrpcServicesList</param-value>
- </init-param>
- <init-param>
- <param-name>authHandlerBeanName</param-name>
- <param-value>xmlRpcAuthenticator</param-value>
- </init-param>
- <init-param>
- <param-name>enabledForExtensions</param-name>
- <param-value>true</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>RedbackXmlRpcServlet</servlet-name>
- <servlet-class>com.atlassian.xmlrpc.spring.BinderSpringXmlRpcServlet</servlet-class>
- <init-param>
- <param-name>serviceListBeanName</param-name>
- <param-value>redbackXmlrpcServicesList</param-value>
- </init-param>
- <init-param>
- <param-name>authHandlerBeanName</param-name>
- <param-value>redbackXmlRpcAuthenticator</param-value>
- </init-param>
- <init-param>
- <param-name>enabledForExtensions</param-name>
- <param-value>true</param-value>
- </init-param>
- </servlet>
-
- <servlet>
- <servlet-name>RssFeedServlet</servlet-name>
- <servlet-class>
- org.apache.archiva.web.rss.RssFeedServlet
- </servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>RssFeedServlet</servlet-name>
- <url-pattern>/feeds/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>RepositoryServlet</servlet-name>
- <url-pattern>/repository/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>XmlRpcServlet</servlet-name>
- <url-pattern>/xmlrpc</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>RedbackXmlRpcServlet</servlet-name>
- <url-pattern>/redback-xmlrpc</url-pattern>
- </servlet-mapping>
-
- <resource-ref>
- <res-ref-name>jdbc/users</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <res-ref-name>mail/Session</res-ref-name>
- <res-type>javax.mail.Session</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
+ <servlet-name>RssFeedServlet</servlet-name>
+ <servlet-class>
+ org.apache.archiva.web.rss.RssFeedServlet
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>RssFeedServlet</servlet-name>
+ <url-pattern>/feeds/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>RepositoryServlet</servlet-name>
+ <url-pattern>/repository/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>XmlRpcServlet</servlet-name>
+ <url-pattern>/xmlrpc</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>RedbackXmlRpcServlet</servlet-name>
+ <url-pattern>/redback-xmlrpc</url-pattern>
+ </servlet-mapping>
+ <resource-ref>
+ <res-ref-name>jdbc/users</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
+ </resource-ref>
+ <resource-ref>
+ <res-ref-name>mail/Session</res-ref-name>
+ <res-type>javax.mail.Session</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
+ </resource-ref>
<servlet>
<servlet-name>CXFServlet</servlet-name>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LegacySupportTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LegacySupportTest.java?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LegacySupportTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LegacySupportTest.java Fri Dec 16 13:13:10 2011
@@ -78,65 +78,65 @@ public class LegacySupportTest
assertTextPresent( "You must enter a type." );
}
- public void testAddLegacyArtifact_InvalidValues()
- {
+ public void testAddLegacyArtifact_InvalidValues()
+ {
goToLegacySupportPage();
clickLinkWithText( "Add" );
- addLegacyArtifactPath( "<> ~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"",
+ addLegacyArtifactPath( "<> ~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"",
false );
- assertTextPresent( "Legacy path must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
+ assertTextPresent( "Legacy path must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
assertTextPresent( "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
assertTextPresent( "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
assertTextPresent( "Version must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
assertTextPresent( "Classifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
assertTextPresent( "Type must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
- }
+ }
- public void testAddLegacyArtifact_InvalidLegacyPath()
- {
+ public void testAddLegacyArtifact_InvalidLegacyPath()
+ {
goToLegacySupportPage();
clickLinkWithText( "Add" );
- addLegacyArtifactPath( "<> ~+[ ]'\"" , "test" , "test" , "1.0-SNAPSHOT" , "testing" , "jar", false );
- assertTextPresent( "Legacy path must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
- }
+ addLegacyArtifactPath( "<> ~+[ ]'\"" , "test" , "test" , "1.0-SNAPSHOT" , "testing" , "jar", false );
+ assertTextPresent( "Legacy path must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
+ }
- public void testAddLegacyArtifact_InvalidGroupId()
- {
+ public void testAddLegacyArtifact_InvalidGroupId()
+ {
goToLegacySupportPage();
clickLinkWithText( "Add" );
- addLegacyArtifactPath( "test" , "<> \\/~+[ ]'\"" , "test" , "1.0-SNAPSHOT" , "testing" , "jar", false );
- assertTextPresent( "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
- }
+ addLegacyArtifactPath( "test" , "<> \\/~+[ ]'\"" , "test" , "1.0-SNAPSHOT" , "testing" , "jar", false );
+ assertTextPresent( "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
+ }
- public void testAddLegacyArtifact_InvalidArtifactId()
- {
+ public void testAddLegacyArtifact_InvalidArtifactId()
+ {
goToLegacySupportPage();
clickLinkWithText( "Add" );
- addLegacyArtifactPath( "test" , "test" , "<> \\/~+[ ]'\"" , "1.0-SNAPSHOT" , "testing" , "jar", false );
- assertTextPresent( "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
- }
+ addLegacyArtifactPath( "test" , "test" , "<> \\/~+[ ]'\"" , "1.0-SNAPSHOT" , "testing" , "jar", false );
+ assertTextPresent( "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
+ }
- public void testAddLegacyArtifact_InvalidVersion()
- {
+ public void testAddLegacyArtifact_InvalidVersion()
+ {
goToLegacySupportPage();
clickLinkWithText( "Add" );
- addLegacyArtifactPath( "test" , "test" , "test" , "<> \\/~+[ ]'\"" , "testing" , "jar", false );
- assertTextPresent( "Version must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
- }
+ addLegacyArtifactPath( "test" , "test" , "test" , "<> \\/~+[ ]'\"" , "testing" , "jar", false );
+ assertTextPresent( "Version must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
+ }
- public void testAddLegacyArtifact_InvalidType()
- {
+ public void testAddLegacyArtifact_InvalidType()
+ {
goToLegacySupportPage();
clickLinkWithText( "Add" );
- addLegacyArtifactPath( "test" , "test" , "test" , "1.0-SNAPSHOT" , "testing" , "<> \\/~+[ ]'\"", false );
- assertTextPresent( "Type must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
- }
+ addLegacyArtifactPath( "test" , "test" , "test" , "1.0-SNAPSHOT" , "testing" , "<> \\/~+[ ]'\"", false );
+ assertTextPresent( "Type must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
+ }
- public void testAddLegacyArtifact_InvalidClassifier()
- {
+ public void testAddLegacyArtifact_InvalidClassifier()
+ {
goToLegacySupportPage();
clickLinkWithText( "Add" );
- addLegacyArtifactPath( "test" , "test" , "test" , "1.0-SNAPSHOT" , "<> \\/~+[ ]'\"" , "jar", false );
- assertTextPresent( "Classifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
- }
-}
\ No newline at end of file
+ addLegacyArtifactPath( "test" , "test" , "test" , "1.0-SNAPSHOT" , "<> \\/~+[ ]'\"" , "jar", false );
+ assertTextPresent( "Classifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
+ }
+}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/NetworkProxiesTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/NetworkProxiesTest.java?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/NetworkProxiesTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/NetworkProxiesTest.java Fri Dec 16 13:13:10 2011
@@ -61,55 +61,55 @@ public class NetworkProxiesTest
}
@Test (dependsOnMethods = { "testAddNetworkProxiesNullHostname" } )
- public void testAddNetworkProxiesInvalidValues()
- {
- goToNetworkProxiesPage();
- addNetworkProxy( "<> \\/~+[ ]'\"", "<> ~+[ ]'\"", "<> ~+[ ]'\"", "0", "<> ~+[ ]'\"", "");
- assertTextPresent( "Proxy id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
+ public void testAddNetworkProxiesInvalidValues()
+ {
+ goToNetworkProxiesPage();
+ addNetworkProxy( "<> \\/~+[ ]'\"", "<> ~+[ ]'\"", "<> ~+[ ]'\"", "0", "<> ~+[ ]'\"", "");
+ assertTextPresent( "Proxy id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
assertTextPresent( "Protocol must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), dots(.), colons(:), and dashes(-)." );
assertTextPresent( "Host must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
assertTextPresent( "Port needs to be larger than 1" );
assertTextPresent( "Username must only contain alphanumeric characters, at's(@), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
- }
+ }
@Test (dependsOnMethods = { "testAddNetworkProxiesInvalidValues" } )
- public void testAddNetworkProxiesInvalidIdentifier()
- {
- goToNetworkProxiesPage();
- addNetworkProxy( "<> \\/~+[ ]'\"", "http", "localhost", "8080", "", "");
- assertTextPresent( "Proxy id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
- }
+ public void testAddNetworkProxiesInvalidIdentifier()
+ {
+ goToNetworkProxiesPage();
+ addNetworkProxy( "<> \\/~+[ ]'\"", "http", "localhost", "8080", "", "");
+ assertTextPresent( "Proxy id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." );
+ }
@Test (dependsOnMethods = { "testAddNetworkProxiesInvalidIdentifier" } )
- public void testAddNetworkProxiesInvalidProtocol()
- {
- goToNetworkProxiesPage();
- addNetworkProxy( "testing123", "<> ~+[ ]'\"", "localhost", "8080", "", "");
- assertTextPresent( "Protocol must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), dots(.), colons(:), and dashes(-)." );
- }
+ public void testAddNetworkProxiesInvalidProtocol()
+ {
+ goToNetworkProxiesPage();
+ addNetworkProxy( "testing123", "<> ~+[ ]'\"", "localhost", "8080", "", "");
+ assertTextPresent( "Protocol must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), dots(.), colons(:), and dashes(-)." );
+ }
@Test (dependsOnMethods = { "testAddNetworkProxiesInvalidProtocol" } )
- public void testAddNetworkProxiesInvalidHostname()
- {
- goToNetworkProxiesPage();
- addNetworkProxy( "testing123", "http", "<> ~+[ ]'\"", "8080", "", "");
- assertTextPresent( "Host must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
- }
+ public void testAddNetworkProxiesInvalidHostname()
+ {
+ goToNetworkProxiesPage();
+ addNetworkProxy( "testing123", "http", "<> ~+[ ]'\"", "8080", "", "");
+ assertTextPresent( "Host must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
+ }
@Test (dependsOnMethods = { "testAddNetworkProxiesInvalidHostname" } )
- public void testAddNetworkProxiesInvalidPort()
- {
- goToNetworkProxiesPage();
- addNetworkProxy( "testing123", "http", "localhost", "0", "", "");
- assertTextPresent( "Port needs to be larger than 1" );
- }
+ public void testAddNetworkProxiesInvalidPort()
+ {
+ goToNetworkProxiesPage();
+ addNetworkProxy( "testing123", "http", "localhost", "0", "", "");
+ assertTextPresent( "Port needs to be larger than 1" );
+ }
@Test (dependsOnMethods = { "testAddNetworkProxiesInvalidPort" } )
- public void testAddNetworkProxiesInvalidUsername()
- {
- goToNetworkProxiesPage();
- addNetworkProxy( "testing123", "http", "localhost", "8080", "<> ~+[ ]'\"", "");
- assertTextPresent( "Username must only contain alphanumeric characters, at's(@), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
+ public void testAddNetworkProxiesInvalidUsername()
+ {
+ goToNetworkProxiesPage();
+ addNetworkProxy( "testing123", "http", "localhost", "8080", "<> ~+[ ]'\"", "");
+ assertTextPresent( "Username must only contain alphanumeric characters, at's(@), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." );
}
@Test (dependsOnMethods = { "testAddNetworkProxiesInvalidUsername" } )
@@ -145,4 +145,4 @@ public class NetworkProxiesTest
assertTextPresent( "testing123" );
}
-}
\ No newline at end of file
+}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy Fri Dec 16 13:13:10 2011
@@ -114,22 +114,22 @@ grant {
permission java.util.PropertyPermission "java.vendor", "read";
permission java.util.PropertyPermission "java.vendor.url", "read";
permission java.util.PropertyPermission "java.class.version", "read";
- permission java.util.PropertyPermission "java.specification.version", "read";
- permission java.util.PropertyPermission "java.specification.vendor", "read";
- permission java.util.PropertyPermission "java.specification.name", "read";
-
- permission java.util.PropertyPermission "java.vm.specification.version", "read";
- permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
- permission java.util.PropertyPermission "java.vm.specification.name", "read";
- permission java.util.PropertyPermission "java.vm.version", "read";
- permission java.util.PropertyPermission "java.vm.vendor", "read";
- permission java.util.PropertyPermission "java.vm.name", "read";
+ permission java.util.PropertyPermission "java.specification.version", "read";
+ permission java.util.PropertyPermission "java.specification.vendor", "read";
+ permission java.util.PropertyPermission "java.specification.name", "read";
+
+ permission java.util.PropertyPermission "java.vm.specification.version", "read";
+ permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
+ permission java.util.PropertyPermission "java.vm.specification.name", "read";
+ permission java.util.PropertyPermission "java.vm.version", "read";
+ permission java.util.PropertyPermission "java.vm.vendor", "read";
+ permission java.util.PropertyPermission "java.vm.name", "read";
// Required for OpenJMX
permission java.lang.RuntimePermission "getAttribute";
- // Allow read of JAXP compliant XML parser debug
- permission java.util.PropertyPermission "jaxp.debug", "read";
+ // Allow read of JAXP compliant XML parser debug
+ permission java.util.PropertyPermission "jaxp.debug", "read";
// Precompiled JSPs need access to this package.
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml Fri Dec 16 13:13:10 2011
@@ -1,35 +1,35 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- The contents of this file will be loaded for each web application -->
-<Context>
-
- <!-- Default set of monitored resources -->
- <WatchedResource>WEB-INF/web.xml</WatchedResource>
-
- <!-- Uncomment this to disable session persistence across Tomcat restarts -->
- <!--
- <Manager pathname="" />
- -->
-
- <!-- Uncomment this to enable Comet connection tacking (provides events
- on session expiration as well as webapp lifecycle) -->
- <!--
- <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" />
- -->
-
-</Context>
\ No newline at end of file
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- The contents of this file will be loaded for each web application -->
+<Context>
+
+ <!-- Default set of monitored resources -->
+ <WatchedResource>WEB-INF/web.xml</WatchedResource>
+
+ <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+ <!--
+ <Manager pathname="" />
+ -->
+
+ <!-- Uncomment this to enable Comet connection tacking (provides events
+ on session expiration as well as webapp lifecycle) -->
+ <!--
+ <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" />
+ -->
+
+</Context>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/mapper/RepositoryActionMapper.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/mapper/RepositoryActionMapper.java?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/mapper/RepositoryActionMapper.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/mapper/RepositoryActionMapper.java Fri Dec 16 13:13:10 2011
@@ -76,8 +76,8 @@ public class RepositoryActionMapper
String path = httpServletRequest.getServletPath();
if ("".equals(path)){
- // if JEE 5 spec is correctly implemented, the "/*" pattern implies an empty string in servletpath
- path = httpServletRequest.getPathInfo();
+ // if JEE 5 spec is correctly implemented, the "/*" pattern implies an empty string in servletpath
+ path = httpServletRequest.getPathInfo();
}
if (StringUtils.isEmpty( path ))
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-mime-types.txt
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-mime-types.txt?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-mime-types.txt (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-mime-types.txt Fri Dec 16 13:13:10 2011
@@ -19,7 +19,7 @@ application/octet-stream
application/oda oda
application/ogg ogg
application/pdf pdf
-application/pgp-encrypted pgp
+application/pgp-encrypted pgp
application/postscript ai eps ps
application/rdf+xml rdf
application/smil smi smil
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp Fri Dec 16 13:13:10 2011
@@ -70,14 +70,14 @@
<%--td>${repository.layout}</td--%>
<td>
<c:choose>
- <c:when test="${repository.layout == 'default'}">
- Maven 2.x Repository
- </c:when>
- <c:otherwise>
- Maven 1.x Repository
- </c:otherwise>
- </c:choose>
- </td>
+ <c:when test="${repository.layout == 'default'}">
+ Maven 2.x Repository
+ </c:when>
+ <c:otherwise>
+ Maven 1.x Repository
+ </c:otherwise>
+ </c:choose>
+ </td>
</tr>
<tr>
<td>Cron:</td>
@@ -109,7 +109,7 @@
</tr>
</table>
</div>
-
+
<s:form method="post" action="%{action}" namespace="/admin" validate="true" theme="simple">
<div class="buttons">
<s:hidden name="repository.id" value="%{#attr.repository.id}"/>
@@ -127,12 +127,12 @@
<c:choose>
<c:when test="${action == 'addRepository'}">
- <s:submit value="Save" method="confirmAdd"/>
- </c:when>
- <c:otherwise>
- <s:submit value="Save" method="confirmUpdate"/>
- </c:otherwise>
- </c:choose>
+ <s:submit value="Save" method="confirmAdd"/>
+ </c:when>
+ <c:otherwise>
+ <s:submit value="Save" method="confirmUpdate"/>
+ </c:otherwise>
+ </c:choose>
<s:submit value="Cancel" method="execute"/>
</div>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp Fri Dec 16 13:13:10 2011
@@ -24,7 +24,7 @@
<c:choose>
<c:when test="${mode == 'edit'}">
<c:set var="addedit" value="Edit" />
- <c:set var="networkProxyName" value="${proxy.id}" />
+ <c:set var="networkProxyName" value="${proxy.id}" />
</c:when>
<c:otherwise>
<c:set var="addedit" value="Add" />
@@ -65,14 +65,14 @@
<s:hidden name="mode"/>
<s:token/>
- <c:choose>
- <c:when test="${mode == 'edit'}">
- <s:hidden name="proxy.id"/>
- </c:when>
- <c:otherwise>
- <s:textfield name="proxy.id" label="Identifier" size="10" required="true"/>
- </c:otherwise>
- </c:choose>
+ <c:choose>
+ <c:when test="${mode == 'edit'}">
+ <s:hidden name="proxy.id"/>
+ </c:when>
+ <c:otherwise>
+ <s:textfield name="proxy.id" label="Identifier" size="10" required="true"/>
+ </c:otherwise>
+ </c:choose>
<%@ include file="/WEB-INF/jsp/admin/include/networkProxyForm.jspf" %>
<s:submit value="Save Network Proxy"/>
@@ -85,4 +85,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp Fri Dec 16 13:13:10 2011
@@ -62,19 +62,18 @@
<div style="float:right">
<c:choose>
- <c:when test="${remoteRepoExists}">
- <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
- <s:url id="addProxyConnectorUrl" action="addProxyConnector"/>
- <s:a href="%{addProxyConnectorUrl}" cssClass="create">
- <img src="<c:url value="/images/icons/create.png" />"/>
- Add
- </s:a>
- </redback:ifAnyAuthorized>
- </c:when>
- <c:otherwise>
- <img src="<c:url value="/images/icons/create.png" />"/>
- Add (Disabled. No remote repositories)
- </c:otherwise>
+ <c:when test="${remoteRepoExists}">
+ <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
+ <s:url id="addProxyConnectorUrl" action="addProxyConnector"/>
+ <s:a href="%{addProxyConnectorUrl}" cssClass="create">
+ <img src="<c:url value="/images/icons/create.png" />"/> Add
+ </s:a>
+ </redback:ifAnyAuthorized>
+ </c:when>
+ <c:otherwise>
+ <img src="<c:url value="/images/icons/create.png" />"/>
+ Add (Disabled. No remote repositories)
+ </c:otherwise>
</c:choose>
</div>
@@ -143,14 +142,14 @@
<s:param name="struts.token"><s:property value="struts.token"/></s:param>
</s:url>
<c:if test="${connector.disabled}">
- <s:a href="%{enableProxyConnectorUrl}" title="Enable Proxy Connector">
- <img src="${iconDisable}"/>
- </s:a>
+ <s:a href="%{enableProxyConnectorUrl}" title="Enable Proxy Connector">
+ <img src="${iconDisable}"/>
+ </s:a>
</c:if>
<c:if test="${connector.disabled == false}">
- <s:a href="%{disableProxyConnectorUrl}" title="Disable Proxy Connector">
- <img src="${iconEnable}"/>
- </s:a>
+ <s:a href="%{disableProxyConnectorUrl}" title="Disable Proxy Connector">
+ <img src="${iconEnable}"/>
+ </s:a>
</c:if>
<c:if test="${pc.count > 1}">
<s:a href="%{sortUpProxyConnectorUrl}" title="Move Proxy Connector Up">
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp Fri Dec 16 13:13:10 2011
@@ -120,7 +120,7 @@
</redback:ifAnyAuthorized>
<c:url var="rssFeedIconUrl" value="/images/icons/rss-feed.png"/>
<a href='/archiva/feeds/<c:out value="${repository.id}" />'>
- <img src="${rssFeedIconUrl}" />
+ <img src="${rssFeedIconUrl}" />
</a>
</div>
@@ -149,10 +149,10 @@
<td><c:out value="${repository.location}" /></td>
</tr>
<c:if test="${!empty (repository.indexDirectory)}">
- <tr>
- <th>Index Directory</th>
- <td><c:out value="${repository.indexDirectory}" /></td>
- </tr>
+ <tr>
+ <th>Index Directory</th>
+ <td><c:out value="${repository.indexDirectory}" /></td>
+ </tr>
</c:if>
<tr>
<th>WebDAV URL</th>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/deleteArtifactForm.jspf
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/deleteArtifactForm.jspf?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/deleteArtifactForm.jspf (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/deleteArtifactForm.jspf Fri Dec 16 13:13:10 2011
@@ -27,4 +27,3 @@
<s:textfield name="classifier" label="Classifier" size="60" required="false"/>
<s:textfield name="type" label="Type (mandatory when using classifier)" size="60" required="false" />
<s:select name="repositoryId" list="managedRepos" label="Repository Id"/>
-
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf Fri Dec 16 13:13:10 2011
@@ -28,10 +28,7 @@
<s:textfield name="version" label="Version" size="50" required="true"/>
<s:textfield name="packaging" label="Packaging" size="50" required="true"/>
<s:textfield name="classifier" label="Classifier" size="50" required="false"/>
-<s:checkbox name="generatePom" value="generatePom"
- label="Generate Maven 2 POM"/>
+<s:checkbox name="generatePom" value="generatePom" label="Generate Maven 2 POM"/>
<s:file name="artifact" label="Artifact File" required="true"/>
<s:file name="pom" label="POM File"/>
<s:select name="repositoryId" list="managedRepoIdList" label="Repository Id"/>
-
-
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp Fri Dec 16 13:13:10 2011
@@ -39,7 +39,7 @@
var table = document.getElementById( "dynamicTable" );
var row = document.createElement( "TR" );
var label = document.createElement("TD");
- label.innerHTML = fieldText + ": ";
+ label.innerHTML = fieldText + ": ";
var textfield = document.createElement( "TD" );
var inp1 = document.createElement( "INPUT" );
@@ -152,4 +152,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp Fri Dec 16 13:13:10 2011
@@ -26,150 +26,127 @@
<title>Audit Log Report</title>
<s:head theme="xhtml" />
-
+
<link rel="stylesheet" href="<c:url value='/css/no-theme/jquery.ui-1.8.14.theme.css'/>" type="text/css" />
<script type="text/javascript" src="<c:url value='/js/jquery-1.6.1.min.js'/>"></script>
<script type="text/javascript" src="<c:url value='/js/jquery-ui-1.8.14.custom.min.js'/>"></script>
<script type="text/javascript" charset="utf-8">
$(document).ready(function()
{
- $('#startDate').datepicker()
- $('#endDate').datepicker()
+ $('#startDate').datepicker()
+ $('#endDate').datepicker()
});
</script>
</head>
<body>
<h1>Audit Log Report</h1>
-
+
<div id="contentArea">
-
+
<s:form action="viewAuditLogReport" namespace="/report" validate="false">
-
+
<s:hidden name="initial"/>
-
- <div id="auditLogReport">
- <table id="auditLogFieds">
- <tbody>
- <tr>
- <td>Repository: </td>
- <td><s:select name="repository" list="repositories" theme="simple"/></td>
- <tr>
- <tr>
- <td>Group ID: </td>
- <td><s:textfield id="groupId" name="groupId" theme="simple"/></td>
- <tr>
- <tr>
- <td>Artifact ID: </td>
- <td><s:textfield id="artifactId" name="artifactId" theme="simple"/></td>
- <tr>
- <tr>
- <td>Start Date: </td>
- <td><s:textfield id="startDate" name="startDate" theme="simple"/>
- <%--
- <script type="text/javascript">
- Calendar.setup({
- inputField : "startDate",
- ifFormat : "%Y-%m-%d",
- align : "Tl",
- singleClick : true
- });
- </script>
- --%>
- </td>
- <tr>
- <tr>
- <td>End Date: </td>
- <td><s:textfield id="endDate" name="endDate" theme="simple"/>
- <%--
- <script type="text/javascript">
- Calendar.setup({
- inputField : "endDate",
- ifFormat : "%Y-%m-%d",
- align : "Tl",
- singleClick : true
- });
- </script>
- --%>
- </td>
- <tr>
- <tr>
- <td>Row Count: </td>
- <td><s:textfield name="rowCount" theme="simple"/></td>
- <tr>
- <tr>
- <td/>
- <td style="text-align: right"><s:submit value="View Audit Log" theme="simple"/></td>
- </tr>
- </tbody>
- </table>
- </div>
-
+
+ <div id="auditLogReport">
+ <table id="auditLogFieds">
+ <tbody>
+ <tr>
+ <td>Repository: </td>
+ <td><s:select name="repository" list="repositories" theme="simple"/></td>
+ </tr>
+ <tr>
+ <td>Group ID: </td>
+ <td><s:textfield id="groupId" name="groupId" theme="simple"/></td>
+ </tr>
+ <tr>
+ <td>Artifact ID: </td>
+ <td><s:textfield id="artifactId" name="artifactId" theme="simple"/></td>
+ </tr>
+ <tr>
+ <td>Start Date: </td>
+ <td><s:textfield id="startDate" name="startDate" theme="simple"/></td>
+ </tr>
+ <tr>
+ <td>End Date: </td>
+ <td><s:textfield id="endDate" name="endDate" theme="simple"/></td>
+ </tr>
+ <tr>
+ <td>Row Count: </td>
+ <td><s:textfield name="rowCount" theme="simple"/></td>
+ </tr>
+ <tr>
+ <td/>
+ <td style="text-align: right"><s:submit value="View Audit Log" theme="simple"/></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
<p/>
-
+
<div class="auditLogReportResults">
-
- <h2>${headerName}</h2>
+
+ <h2>${headerName}</h2>
<p>
<s:actionerror/>
</p>
-
- <c:if test="${not empty (auditLogs)}">
- <table class="auditlogs" cellspacing="0">
- <tr>
- <th>Event</th>
- <th>Repository</th>
- <th>Resource</th>
- <th>Event Date</th>
- <th>Username</th>
- </tr>
-
- <c:forEach items="${auditLogs}" var="auditLog" varStatus="i">
- <tr>
- <td>${auditLog.action}</td>
- <td>${auditLog.repositoryId}</td>
- <td>${auditLog.resource}</td>
- <td>${auditLog.timestamp}</td>
- <td>${auditLog.userId}</td>
- </tr>
- </c:forEach>
- </table>
-
- <c:set var="prevPageUrl">
- <s:url action="viewAuditLogReport" namespace="/report">
- <s:param name="repository" value="%{#attr.repository}" />
- <s:param name="groupId" value="%{#attr.groupId}" />
- <s:param name="artifactId" value="%{#attr.artifactId}" />
- <s:param name="rowCount" value="%{#attr.rowCount}" />
- <s:param name="page" value="%{#attr.page - 1}"/>
- <s:param name="startDate" value="%{#attr.startDate}"/>
- <s:param name="endDate" value="%{#attr.endDate}" />
- </s:url>
- </c:set>
- <c:set var="nextPageUrl">
- <s:url action="viewAuditLogReport" namespace="/report">
- <s:param name="repository" value="%{#attr.repository }" />
- <s:param name="groupId" value="%{#attr.groupId}" />
- <s:param name="artifactId" value="%{#attr.artifactId }" />
- <s:param name="rowCount" value="%{#attr.rowCount}" />
- <s:param name="page" value="%{#attr.page + 1}"/>
- <s:param name="startDate" value="%{#attr.startDate}"/>
- <s:param name="endDate" value="%{#attr.endDate}" />
- </s:url>
- </c:set>
-
- <s:set name="page" value="page"/>
- <c:if test="${page gt 1}"><a href="${prevPageUrl}"><<</a></c:if>
- <strong>Page: </strong>${page}
- <s:set name="isLastPage" value="isLastPage"/>
- <c:if test="${!isLastPage}"><a href="${nextPageUrl}">>></a></c:if>
-
- </c:if>
- </div>
-
+
+ <c:if test="${not empty (auditLogs)}">
+ <table class="auditlogs" cellspacing="0">
+ <tr>
+ <th>Event</th>
+ <th>Repository</th>
+ <th>Resource</th>
+ <th>Event Date</th>
+ <th>Username</th>
+ </tr>
+
+ <c:forEach items="${auditLogs}" var="auditLog" varStatus="i">
+ <tr>
+ <td>${auditLog.action}</td>
+ <td>${auditLog.repositoryId}</td>
+ <td>${auditLog.resource}</td>
+ <td>${auditLog.timestamp}</td>
+ <td>${auditLog.userId}</td>
+ </tr>
+ </c:forEach>
+ </table>
+
+ <c:set var="prevPageUrl">
+ <s:url action="viewAuditLogReport" namespace="/report">
+ <s:param name="repository" value="%{#attr.repository}" />
+ <s:param name="groupId" value="%{#attr.groupId}" />
+ <s:param name="artifactId" value="%{#attr.artifactId}" />
+ <s:param name="rowCount" value="%{#attr.rowCount}" />
+ <s:param name="page" value="%{#attr.page - 1}"/>
+ <s:param name="startDate" value="%{#attr.startDate}"/>
+ <s:param name="endDate" value="%{#attr.endDate}" />
+ </s:url>
+ </c:set>
+ <c:set var="nextPageUrl">
+ <s:url action="viewAuditLogReport" namespace="/report">
+ <s:param name="repository" value="%{#attr.repository }" />
+ <s:param name="groupId" value="%{#attr.groupId}" />
+ <s:param name="artifactId" value="%{#attr.artifactId }" />
+ <s:param name="rowCount" value="%{#attr.rowCount}" />
+ <s:param name="page" value="%{#attr.page + 1}"/>
+ <s:param name="startDate" value="%{#attr.startDate}"/>
+ <s:param name="endDate" value="%{#attr.endDate}" />
+ </s:url>
+ </c:set>
+
+ <s:set name="page" value="page"/>
+ <c:if test="${page gt 1}"><a href="${prevPageUrl}"><<</a></c:if>
+ <strong>Page: </strong>${page}
+ <s:set name="isLastPage" value="isLastPage"/>
+ <c:if test="${!isLastPage}"><a href="${nextPageUrl}">>></a></c:if>
+
+ </c:if>
+ </div>
+
</s:form>
-
-
+
</div>
</body>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp Fri Dec 16 13:13:10 2011
@@ -34,23 +34,22 @@
<div id="contentArea">
<c:forEach var="repository" items="${repositoriesMap}">
- <strong>Repository: ${repository.key}</strong>
- <c:forEach var="report" items='${repository.value}'>
-
- <p>
- <archiva:groupIdLink var="${report.namespace}" includeTop="true"/>
- <c:set var="url">
- <s:url action="browseArtifact" namespace="/">
- <s:param name="groupId" value="%{#attr.report.namespace}"/>
- <s:param name="artifactId" value="%{#attr.report.project}"/>
- </s:url>
- </c:set>
- <a href="${url}">${report.project}</a> /
- <strong>${report.version}</strong>
- </p>
+ <strong>Repository: ${repository.key}</strong>
+ <c:forEach var="report" items='${repository.value}'>
+ <p>
+ <archiva:groupIdLink var="${report.namespace}" includeTop="true"/>
+ <c:set var="url">
+ <s:url action="browseArtifact" namespace="/">
+ <s:param name="groupId" value="%{#attr.report.namespace}"/>
+ <s:param name="artifactId" value="%{#attr.report.project}"/>
+ </s:url>
+ </c:set>
+ <a href="${url}">${report.project}</a> /
+ <strong>${report.version}</strong>
+ </p>
- <blockquote><c:out value="${report.message}" /></blockquote>
- </c:forEach>
+ <blockquote><c:out value="${report.message}" /></blockquote>
+ </c:forEach>
</c:forEach>
<c:set var="prevPageUrl">
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp Fri Dec 16 13:13:10 2011
@@ -33,8 +33,8 @@
<script type="text/javascript" charset="utf-8">
$(document).ready(function()
{
- $('#startDate').datepicker();
- $('#endDate').datepicker();
+ $('#startDate').datepicker();
+ $('#endDate').datepicker();
});
</script>
</head>
@@ -54,8 +54,8 @@
addToRightOnclick="selectAllOptions(document.getElementById('generateStatisticsReport_availableRepositories'));selectAllOptions(document.getElementById('generateStatisticsReport_selectedRepositories'));"
addAllToLeftOnclick="selectAllOptions(document.getElementById('generateStatisticsReport_availableRepositories'));selectAllOptions(document.getElementById('generateStatisticsReport_selectedRepositories'));"
addToLeftOnclick="selectAllOptions(document.getElementById('generateStatisticsReport_availableRepositories'));selectAllOptions(document.getElementById('generateStatisticsReport_selectedRepositories'));"
- />
-
+ />
+
<s:textfield label="Row Count" name="rowCount" />
<s:textfield label="Start Date" id="startDate" name="startDate"/>