I would prefer a runtime dependency instead of a buildtime including
into theme-standard.jar.
maybe we could create a tobago-dojo.jar and depoly to a public maven repository?
Regards,
Volker
2008/1/27, [EMAIL PROTECTED] <[EMAIL PROTECTED]>:
> Author: bommel
> Date: Sun Jan 27 05:57:01 2008
> New Revision: 615601
>
> URL: http://svn.apache.org/viewvc?rev=615601&view=rev
> Log:
> (TOBAGO-543) replace prototype with dojo as underlying ajax library start
> fixing inputSuggest
>
> Modified:
>
> myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
> myfaces/tobago/trunk/theme/standard/pom.xml
>
> Modified:
> myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
> URL:
> http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java?rev=615601&r1=615600&r2=615601&view=diff
> ==============================================================================
> ---
> myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
> (original)
> +++
> myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
> Sun Jan 27 05:57:01 2008
> @@ -88,10 +88,10 @@
>
> String resource = requestURI.substring(
> request.getContextPath().length() + 1); // todo: make it "stable"
> - if (resource.startsWith(DOJO_RESOURCE_PREFIX)) {
> - // Todo : dojo version
> - resource = "dojo-release-1.0.1/" +
> resource.substring(DOJO_RESOURCE_PREFIX.length());
> - }
> + //if (resource.startsWith(DOJO_RESOURCE_PREFIX)) {
> + // // Todo : dojo version
> + // resource = "dojo-release-1.0.1/" +
> resource.substring(DOJO_RESOURCE_PREFIX.length());
> + //}
>
> if (expires != null) {
> response.setHeader("Cache-Control", "max-age=" + expires);
>
> Modified: myfaces/tobago/trunk/theme/standard/pom.xml
> URL:
> http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/pom.xml?rev=615601&r1=615600&r2=615601&view=diff
> ==============================================================================
> --- myfaces/tobago/trunk/theme/standard/pom.xml (original)
> +++ myfaces/tobago/trunk/theme/standard/pom.xml Sun Jan 27 05:57:01 2008
> @@ -15,9 +15,10 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> -->
> -<project xmlns="http://maven.apache.org/POM/4.0.0";
> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
> http://maven.apache.org/maven-v4_0_0.xsd";>
> +<project xmlns="http://maven.apache.org/POM/4.0.0";
> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
> http://maven.apache.org/maven-v4_0_0.xsd";>
> <modelVersion>4.0.0</modelVersion>
> - <parent>
> + <parent>
> <groupId>org.apache.myfaces.tobago</groupId>
> <artifactId>tobago-theme</artifactId>
> <version>1.1.0-SNAPSHOT</version>
> @@ -25,19 +26,61 @@
> <artifactId>tobago-theme-standard</artifactId>
> <packaging>jar</packaging>
> <name>Theme Standard</name>
> - <!--<build>
> + <build>
> <plugins>
> <plugin>
> + <groupId>org.codehaus.mojo</groupId>
> + <artifactId>dependency-maven-plugin</artifactId>
> + <executions>
> + <execution>
> + <id>unpack-dojo</id>
> + <phase>process-classes</phase>
> + <goals>
> + <goal>unpack</goal>
> + </goals>
> + <configuration>
> + <artifactItems>
> + <artifactItem>
> + <groupId>org.dojotoolkit</groupId>
> + <artifactId>dojo</artifactId>
> + <version>1.0.1</version>
> + <type>zip</type>
> + </artifactItem>
> + <artifactItem>
> + <groupId>org.dojotoolkit</groupId>
> + <artifactId>dijit</artifactId>
> + <version>1.0.1</version>
> + <type>zip</type>
> + </artifactItem>
> + </artifactItems>
> + <outputDirectory>
> +
> ${project.build.directory}/classes/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/dojo
> + </outputDirectory>
> + <unpackMarkersDirectory>${project.build.directory}/dojo
> + </unpackMarkersDirectory>
> + </configuration>
> + </execution>
> + </executions>
> + </plugin>
> + <!--<plugin>
> <groupId>gr.abiss.mvn.plugins</groupId>
> <artifactId>mvn-jstools</artifactId>
> <version>0.1</version>
> - </plugin>
> + </plugin>-->
> </plugins>
> - </build>-->
> + </build>
> +
> + <repositories>
> + <repository>
> + <id>Temp dojo repository</id>
> + <url>http://people.apache.org/~bommel/dojorepo</url>
> + </repository>
> + </repositories>
>
> <scm>
>
> <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme/standard</connection>
> -
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme/standard</developerConnection>
> +
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme/standard
> + </developerConnection>
>
> <url>http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard</url>
> </scm>
>
> @@ -57,13 +100,6 @@
> <artifactId>tools</artifactId>
> </exclusion>
> </exclusions>
> - </dependency>
> - <dependency>
> - <groupId>org.dojotoolkit</groupId>
> - <artifactId>dojo-release</artifactId>
> - <version>1.0.1</version>
> - <!--<type>zip</type>-->
> - <scope>runtime</scope>
> </dependency>
> <dependency>
> <groupId>javax.servlet</groupId>
>
>
>
--
inexso - information exchange solutions GmbH
Bismarckstraße 13 | 26122 Oldenburg
Tel.: +49 441 4082 356 |
FAX: +49 441 4082 355 | www.inexso.de
