Changeset 2439
- Timestamp:
- 2008-09-07 01:09:43 (2 months ago)
- Location:
- FCKeditor.Java/branches/2.5-test
- Files:
-
- 4 modified
-
java-core/pom.xml (modified) (5 diffs)
-
java-demo/pom.xml (modified) (1 diff)
-
pom.xml (modified) (10 diffs)
-
src/site/site.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
FCKeditor.Java/branches/2.5-test/java-core/pom.xml
r2216 r2439 1 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 1 <project xmlns="http://maven.apache.org/POM/4.0.0" 2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 3 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 2 4 <modelVersion>4.0.0</modelVersion> 3 5 <artifactId>java-core</artifactId> … … 70 72 <configuration> 71 73 <tasks> 72 <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" /> 73 <replaceregexp byline="true" flags="m" file="target/site/tagreference.html"> 74 <regexp pattern="&lt;a href=&quot;(\p{Graph}+)&quot;\s*&gt;(\p{Graph}+)&lt;/a&gt;" /> 75 <substitution expression="<a href="\1">\2</a>" /> 74 <property name="ant.regexp.regexpimpl" 75 value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" /> 76 <replaceregexp byline="true" flags="m" 77 file="target/site/tagreference.html"> 78 <regexp 79 pattern="&lt;a href=&quot;(\p{Graph}+)&quot;\s*&gt;(\p{Graph}+)&lt;/a&gt;" /> 80 <substitution 81 expression="<a href="\1">\2</a>" /> 76 82 </replaceregexp> 77 83 </tasks> … … 86 92 </dependency> 87 93 </dependencies>--> 94 </plugin> 95 <plugin> 96 <artifactId>maven-javadoc-plugin</artifactId> 97 <executions> 98 <execution> 99 <id>attach-javadocs</id> 100 <goals> 101 <goal>jar</goal> 102 </goals> 103 </execution> 104 </executions> 88 105 </plugin> 89 106 </plugins> … … 136 153 </reportSets> 137 154 </plugin> 155 <plugin> 156 <artifactId>maven-javadoc-plugin</artifactId> 157 <configuration> 158 <quiet>true</quiet> 159 </configuration> 160 <reportSets> 161 <reportSet> 162 <reports> 163 <report>javadoc</report> 164 </reports> 165 </reportSet> 166 </reportSets> 167 </plugin> 138 168 </plugins> 139 169 </reporting> … … 142 172 <description> 143 173 This Java library enables the FCKeditor to be used in a 144 Servlet/J2EE environment. It provides JSP tags for creating a FCKeditor 145 instance and a Servlet handling server-side user files and folders. 174 Servlet/J2EE environment. It provides JSP tags for creating a 175 FCKeditor instance and a Servlet handling server-side user files 176 and folders. 146 177 </description> 147 178 <url>http://java.fckeditor.net</url> -
FCKeditor.Java/branches/2.5-test/java-demo/pom.xml
r2225 r2439 1 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 1 <project xmlns="http://maven.apache.org/POM/4.0.0" 2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 3 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 2 4 <modelVersion>4.0.0</modelVersion> 3 5 <artifactId>java-demo</artifactId> -
FCKeditor.Java/branches/2.5-test/pom.xml
r2348 r2439 1 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 1 <project xmlns="http://maven.apache.org/POM/4.0.0" 2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 3 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 2 4 <modelVersion>4.0.0</modelVersion> 3 5 <groupId>net.fckeditor</groupId> … … 10 12 </modules> 11 13 <properties> 12 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 13 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> 14 <project.build.sourceEncoding> 15 UTF-8 16 </project.build.sourceEncoding> 17 <project.reporting.outputEncoding> 18 UTF-8 19 </project.reporting.outputEncoding> 14 20 <slf4j.version>1.5.2</slf4j.version> 15 21 16 22 <!-- site plugin properties for Velocity --> 17 23 <slf4jVersion>${slf4j.version}</slf4jVersion> … … 33 39 </configuration> 34 40 </plugin> 41 <plugin> 42 <artifactId>maven-javadoc-plugin</artifactId> 43 <version>2.5</version> 44 </plugin> 35 45 </plugins> 36 46 </pluginManagement> … … 71 81 </plugin> 72 82 <plugin> 73 <artifactId>maven-javadoc-plugin</artifactId>74 <executions>75 <execution>76 <id>attach-javadocs</id>77 <goals>78 <goal>jar</goal>79 </goals>80 </execution>81 </executions>82 </plugin>83 <plugin>84 83 <artifactId>maven-jar-plugin</artifactId> 85 84 <configuration> … … 99 98 </configuration> 100 99 </plugin> 101 102 100 <plugin> 103 101 <artifactId>maven-antrun-plugin</artifactId> … … 111 109 <configuration> 112 110 <tasks> 113 <copy overwrite="true" todir="src/site" flatten="true"> 111 <copy overwrite="true" todir="src/site" 112 flatten="true"> 114 113 <fileset dir=".."> 115 <include name="src/site/site.xml" /> 114 <include 115 name="src/site/site.xml" /> 116 116 </fileset> 117 117 </copy> 118 <replace value="<src>../" token="<src>/" dir=".."> 119 <include name="${pom.artifactId}/src/site/site.xml" /> 120 <exclude name="fckeditor-java/src/site/site.xml" /> 118 <replace value="<src>../" 119 token="<src>/" dir=".."> 120 <include 121 name="${pom.artifactId}/src/site/site.xml" /> 122 <exclude 123 name="fckeditor-java/src/site/site.xml" /> 121 124 </replace> 122 <replace value="href="../" token="href="/" dir=".."> 123 <include name="${pom.artifactId}/src/site/site.xml" /> 124 <exclude name="fckeditor-java/src/site/site.xml" /> 125 <replace value="href="../" 126 token="href="/" dir=".."> 127 <include 128 name="${pom.artifactId}/src/site/site.xml" /> 129 <exclude 130 name="fckeditor-java/src/site/site.xml" /> 125 131 </replace> 126 <replace value="href="" token="href="../${pom.artifactId}/" dir=".."> 127 <include name="${pom.artifactId}/src/site/site.xml" /> 128 <exclude name="fckeditor-java/src/site/site.xml" /> 132 <replace value="href="" 133 token="href="../${pom.artifactId}/" dir=".."> 134 <include 135 name="${pom.artifactId}/src/site/site.xml" /> 136 <exclude 137 name="fckeditor-java/src/site/site.xml" /> 129 138 </replace> 130 <replace value="href="../images" token="href="images" dir=".."> 131 <include name="${pom.artifactId}/src/site/site.xml" /> 132 <exclude name="fckeditor-java/src/site/site.xml" /> 139 <replace value="href="../images" 140 token="href="images" dir=".."> 141 <include 142 name="${pom.artifactId}/src/site/site.xml" /> 143 <exclude 144 name="fckeditor-java/src/site/site.xml" /> 133 145 </replace> 134 146 </tasks> … … 156 168 </artifactId> 157 169 <version>2.1</version> 170 <inherited>false</inherited> 158 171 <reportSets> 159 172 <reportSet> … … 185 198 </reportSet> 186 199 </reportSets> 187 </plugin>188 <plugin>189 <artifactId>maven-javadoc-plugin</artifactId>190 <configuration>191 <quiet>true</quiet>192 </configuration>193 200 </plugin> 194 201 </plugins> … … 299 306 </mailingLists> 300 307 <scm> 301 <connection>scm:svn:http://svn.fckeditor.net/FCKeditor.Java/trunk</connection> 302 <developerConnection>scm:svn:https://svn.fckeditor.net/FCKeditor.Java/trunk</developerConnection> 308 <connection> 309 scm:svn:http://svn.fckeditor.net/FCKeditor.Java/trunk 310 </connection> 311 <developerConnection> 312 scm:svn:https://svn.fckeditor.net/FCKeditor.Java/trunk 313 </developerConnection> 303 314 <url>http://dev.fckeditor.net/browser/FCKeditor.Java/trunk</url> 304 315 </scm> … … 309 320 <repository> 310 321 <id>local</id> 311 <url> 312 file:///home/mosipov/public_html/m2repo 313 </url> 322 <url>file:///home/mosipov/public_html/m2repo</url> 314 323 </repository> 315 324 <snapshotRepository> 316 325 <id>local</id> 317 <url> 318 file:///home/mosipov/public_html/m2repo-snapshots 319 </url> 326 <url>file:///home/mosipov/public_html/m2repo-snapshots</url> 320 327 </snapshotRepository> 321 328 <site> 322 329 <id>local</id> 323 <url> 324 file:///home/mosipov/public_html/docs 325 </url> 330 <url>file:///home/mosipov/public_html/docs</url> 326 331 </site> 327 332 </distributionManagement> -
FCKeditor.Java/branches/2.5-test/src/site/site.xml
r2253 r2439 95 95 href="/java-core/taglist.html" 96 96 /> 97 <item name="Test JavaDocs"98 href="/java-core/testapidocs/index.html"99 />100 97 <item name="Test Source Xref" 101 98 href="/java-core/xref-test/index.html"