-
Notifications
You must be signed in to change notification settings - Fork 144
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #256 from paultuckey/to-lf
Use line feeds (not crlf)
- Loading branch information
Showing
54 changed files
with
14,754 additions
and
14,758 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,124 +1,124 @@ | ||
<project> | ||
|
||
<modelVersion>4.0.0</modelVersion> | ||
<groupId>org.tuckey</groupId> | ||
<artifactId>urlrewritefilter-annotation</artifactId> | ||
<packaging>jar</packaging> | ||
<version>5.0.0</version> | ||
<name>UrlRewriteFilter Annotation</name> | ||
<url>http://www.tuckey.org/urlrewrite/</url> | ||
<inceptionYear>2006</inceptionYear> | ||
<description> | ||
Add-on to urlrewritefilter to support annotations | ||
</description> | ||
|
||
<mailingLists> | ||
<mailingList> | ||
<name>UrlRewrite users</name> | ||
<post>[email protected]</post> | ||
<subscribe>[email protected]</subscribe> | ||
<unsubscribe>[email protected]</unsubscribe> | ||
<archive>https://groups.google.com/d/forum/urlrewrite</archive> | ||
</mailingList> | ||
</mailingLists> | ||
|
||
<licenses> | ||
<license> | ||
<name>BSD</name> | ||
<url>http://www.opensource.org/licenses/bsd-license.php</url> | ||
<distribution>repo</distribution> | ||
</license> | ||
</licenses> | ||
|
||
<scm> | ||
<connection>scm:git:https://github.com/paultuckey/urlrewritefilter.git</connection> | ||
<developerConnection>scm:git:https://github.com/paultuckey/urlrewritefilter.git</developerConnection> | ||
<url>https://github.com/paultuckey/urlrewritefilter</url> | ||
</scm> | ||
|
||
<issueManagement> | ||
<url>https://github.com/paultuckey/urlrewritefilter/issues</url> | ||
</issueManagement> | ||
|
||
<build> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-compiler-plugin</artifactId> | ||
<version>2.3.2</version> | ||
<configuration> | ||
<source>1.5</source> | ||
<target>1.5</target> | ||
<compilerArgument>-proc:none</compilerArgument> | ||
</configuration> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>com.sun</groupId> | ||
<artifactId>tools</artifactId> | ||
<version>1.6.0</version> | ||
<scope>system</scope> | ||
<systemPath>${java.home}/../lib/tools.jar</systemPath> | ||
</dependency> | ||
<dependency> | ||
<groupId>junit</groupId> | ||
<artifactId>junit</artifactId> | ||
<version>4.13.1</version> | ||
<scope>compile</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>javax.servlet</groupId> | ||
<artifactId>servlet-api</artifactId> | ||
<version>2.4</version> | ||
<scope>test</scope> | ||
</dependency> | ||
</dependencies> | ||
|
||
<reporting> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-surefire-report-plugin</artifactId> | ||
<version>2.5</version> | ||
</plugin> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-shade-plugin</artifactId> | ||
<version>3.2.2</version> | ||
<executions> | ||
<execution> | ||
<id>jakarta</id> | ||
<phase>package</phase> | ||
<goals> | ||
<goal>shade</goal> | ||
</goals> | ||
<configuration> | ||
<shadedClassifierName>jakarta</shadedClassifierName> | ||
<shadedArtifactAttached>true</shadedArtifactAttached> | ||
<createDependencyReducedPom>false</createDependencyReducedPom> | ||
<artifactSet> | ||
<includes> | ||
<include>${project.groupId}:${project.artifactId}</include> | ||
</includes> | ||
</artifactSet> | ||
<relocations> | ||
<relocation> | ||
<pattern>javax.servlet</pattern> | ||
<shadedPattern>jakarta.servlet</shadedPattern> | ||
</relocation> | ||
<relocation> | ||
<pattern>javax.annotation</pattern> | ||
<shadedPattern>jakarta.annotation</shadedPattern> | ||
</relocation> | ||
</relocations> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
</plugins> | ||
</reporting> | ||
|
||
<project> | ||
|
||
<modelVersion>4.0.0</modelVersion> | ||
<groupId>org.tuckey</groupId> | ||
<artifactId>urlrewritefilter-annotation</artifactId> | ||
<packaging>jar</packaging> | ||
<version>5.0.0</version> | ||
<name>UrlRewriteFilter Annotation</name> | ||
<url>http://www.tuckey.org/urlrewrite/</url> | ||
<inceptionYear>2006</inceptionYear> | ||
<description> | ||
Add-on to urlrewritefilter to support annotations | ||
</description> | ||
|
||
<mailingLists> | ||
<mailingList> | ||
<name>UrlRewrite users</name> | ||
<post>[email protected]</post> | ||
<subscribe>[email protected]</subscribe> | ||
<unsubscribe>[email protected]</unsubscribe> | ||
<archive>https://groups.google.com/d/forum/urlrewrite</archive> | ||
</mailingList> | ||
</mailingLists> | ||
|
||
<licenses> | ||
<license> | ||
<name>BSD</name> | ||
<url>http://www.opensource.org/licenses/bsd-license.php</url> | ||
<distribution>repo</distribution> | ||
</license> | ||
</licenses> | ||
|
||
<scm> | ||
<connection>scm:git:https://github.com/paultuckey/urlrewritefilter.git</connection> | ||
<developerConnection>scm:git:https://github.com/paultuckey/urlrewritefilter.git</developerConnection> | ||
<url>https://github.com/paultuckey/urlrewritefilter</url> | ||
</scm> | ||
|
||
<issueManagement> | ||
<url>https://github.com/paultuckey/urlrewritefilter/issues</url> | ||
</issueManagement> | ||
|
||
<build> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-compiler-plugin</artifactId> | ||
<version>2.3.2</version> | ||
<configuration> | ||
<source>1.5</source> | ||
<target>1.5</target> | ||
<compilerArgument>-proc:none</compilerArgument> | ||
</configuration> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>com.sun</groupId> | ||
<artifactId>tools</artifactId> | ||
<version>1.6.0</version> | ||
<scope>system</scope> | ||
<systemPath>${java.home}/../lib/tools.jar</systemPath> | ||
</dependency> | ||
<dependency> | ||
<groupId>junit</groupId> | ||
<artifactId>junit</artifactId> | ||
<version>4.13.1</version> | ||
<scope>compile</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>javax.servlet</groupId> | ||
<artifactId>servlet-api</artifactId> | ||
<version>2.4</version> | ||
<scope>test</scope> | ||
</dependency> | ||
</dependencies> | ||
|
||
<reporting> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-surefire-report-plugin</artifactId> | ||
<version>2.5</version> | ||
</plugin> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-shade-plugin</artifactId> | ||
<version>3.2.2</version> | ||
<executions> | ||
<execution> | ||
<id>jakarta</id> | ||
<phase>package</phase> | ||
<goals> | ||
<goal>shade</goal> | ||
</goals> | ||
<configuration> | ||
<shadedClassifierName>jakarta</shadedClassifierName> | ||
<shadedArtifactAttached>true</shadedArtifactAttached> | ||
<createDependencyReducedPom>false</createDependencyReducedPom> | ||
<artifactSet> | ||
<includes> | ||
<include>${project.groupId}:${project.artifactId}</include> | ||
</includes> | ||
</artifactSet> | ||
<relocations> | ||
<relocation> | ||
<pattern>javax.servlet</pattern> | ||
<shadedPattern>jakarta.servlet</shadedPattern> | ||
</relocation> | ||
<relocation> | ||
<pattern>javax.annotation</pattern> | ||
<shadedPattern>jakarta.annotation</shadedPattern> | ||
</relocation> | ||
</relocations> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
</plugins> | ||
</reporting> | ||
|
||
</project> |
38 changes: 19 additions & 19 deletions
38
...c/main/java/org/tuckey/web/filters/urlrewrite/annotation/ProcessorServiceLoaderCheck.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,19 @@ | ||
package org.tuckey.web.filters.urlrewrite.annotation; | ||
|
||
import javax.annotation.processing.Processor; | ||
import java.util.ServiceLoader; | ||
|
||
/** | ||
* Quick and dirty class to check that "service" file is loaded in the current classpath. | ||
*/ | ||
public class ProcessorServiceLoaderCheck { | ||
|
||
public static void main(String[] args) { | ||
System.out.println("Checking for services..."); | ||
ServiceLoader<Processor> processorServices = ServiceLoader.load(Processor.class); | ||
for (Object o : processorServices) { | ||
System.out.println(o); | ||
} | ||
System.out.println("Done."); | ||
} | ||
} | ||
package org.tuckey.web.filters.urlrewrite.annotation; | ||
|
||
import javax.annotation.processing.Processor; | ||
import java.util.ServiceLoader; | ||
|
||
/** | ||
* Quick and dirty class to check that "service" file is loaded in the current classpath. | ||
*/ | ||
public class ProcessorServiceLoaderCheck { | ||
|
||
public static void main(String[] args) { | ||
System.out.println("Checking for services..."); | ||
ServiceLoader<Processor> processorServices = ServiceLoader.load(Processor.class); | ||
for (Object o : processorServices) { | ||
System.out.println(o); | ||
} | ||
System.out.println("Done."); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,26 @@ | ||
<project name="UrlRewriteFilter" default="urlrewrite-doc" basedir="."> | ||
|
||
<!-- Give user a chance to override without editing this file (and without typing -D each time) --> | ||
<property file="${user.home}/urlrewrite.build.properties"/> | ||
<property file="${user.home}/build.properties"/> | ||
<property file="${basedir}/target/classes/org/tuckey/web/filters/urlrewrite/build.number.properties" /> | ||
|
||
<property name="build.home" value="target/ant-build"/> | ||
<property name="tomcat.home" value="${user.home}/co/urlrewritefilter/container-test/target/cargo/installs/tomcat-7.0.82/apache-tomcat-7.0.82/"/> | ||
<property name="app.manual-version" value="5.0"/> | ||
|
||
<path id="run.classpath"> | ||
<path path="target/urlrewritefilter-${project.version}.jar"/> | ||
<path path="${tomcat.home}/lib/servlet-api.jar"/> | ||
</path> | ||
|
||
<target name="urlrewrite-doc" description="Create UrlRewriteFilter conf documentation"> | ||
<taskdef name="urlrewritedoc" classpathref="run.classpath" | ||
classname="org.tuckey.web.filters.urlrewrite.UrlRewriteDocTask" /> | ||
<urlrewritedoc | ||
conf="src/test/webapp/WEB-INF/urlrewrite.xml" | ||
dest="src/doc/manual/${app.manual-version}/urlrewrite-conf-overview-sample.html"/> | ||
</target> | ||
|
||
|
||
</project> | ||
<project name="UrlRewriteFilter" default="urlrewrite-doc" basedir="."> | ||
|
||
<!-- Give user a chance to override without editing this file (and without typing -D each time) --> | ||
<property file="${user.home}/urlrewrite.build.properties"/> | ||
<property file="${user.home}/build.properties"/> | ||
<property file="${basedir}/target/classes/org/tuckey/web/filters/urlrewrite/build.number.properties" /> | ||
|
||
<property name="build.home" value="target/ant-build"/> | ||
<property name="tomcat.home" value="${user.home}/co/urlrewritefilter/container-test/target/cargo/installs/tomcat-7.0.82/apache-tomcat-7.0.82/"/> | ||
<property name="app.manual-version" value="5.0"/> | ||
|
||
<path id="run.classpath"> | ||
<path path="target/urlrewritefilter-${project.version}.jar"/> | ||
<path path="${tomcat.home}/lib/servlet-api.jar"/> | ||
</path> | ||
|
||
<target name="urlrewrite-doc" description="Create UrlRewriteFilter conf documentation"> | ||
<taskdef name="urlrewritedoc" classpathref="run.classpath" | ||
classname="org.tuckey.web.filters.urlrewrite.UrlRewriteDocTask" /> | ||
<urlrewritedoc | ||
conf="src/test/webapp/WEB-INF/urlrewrite.xml" | ||
dest="src/doc/manual/${app.manual-version}/urlrewrite-conf-overview-sample.html"/> | ||
</target> | ||
|
||
|
||
</project> |
Oops, something went wrong.