geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Anita Kulshreshtha <a_kuls...@yahoo.com>
Subject Re: svn commit: r601152 [3/4] - in /geronimo/server/trunk: ./ applications/welcome/geronimo-welcome/src/main/java/org/apache/geronimo/welcome/ assemblies/geronimo-boilerplate-minimal/src/main/underlay/META-INF/ assemblies/geronimo-boilerplate-minimal/src/m...
Date Wed, 05 Dec 2007 02:26:21 GMT
  Is the <version> temporary? Could you have used geronimoVersion
property instead of 2.1-SNAPSHOT?

Thanks
Anita
  
--- djencks@apache.org wrote:

> Modified:
>
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
> URL:
>
http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java?rev=601152&r1=601151&r2=601152&view=diff
>
==============================================================================
> ---
>
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
> (original)
> +++
>
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
> Tue Dec  4 15:49:03 2007
> @@ -38,14 +38,14 @@
>  /**
>   * @version $Rev$ $Date$
>   */
> -public class ExplicitDefaultArtifactResolver extends
> DefaultArtifactResolver implements AliasedArtifactResolver {
> +public class ExplicitDefaultArtifactResolver extends
> DefaultArtifactResolver implements LocalAliasedArtifactResolver {
>      private static final String COMMENT = "#You can use this file to
> indicate that you want to substitute one module for another.\n" +
>              "#format is oldartifactid=newartifactId e.g.\n" +
>             
>
"#org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/transaction-jta11/1.2-SNAPSHOT/car\n"
> +
>              "#versions can be ommitted on the left side but not the
> right.\n" +
>              "#This can also specify explicit versions in the same
> format.";
>  
> -    private final String versionMapLocation;
> +    private final String artifactAliasesFile;
>      private final ServerInfo serverInfo;
>  
>      public ExplicitDefaultArtifactResolver(String
> versionMapLocation,
> @@ -53,10 +53,15 @@
>              Collection<? extends ListableRepository> repositories,
>              ServerInfo serverInfo ) throws IOException {
>          super(artifactManager, repositories,
> buildExplicitResolution(versionMapLocation, serverInfo));
> -        this.versionMapLocation = versionMapLocation;
> +        this.artifactAliasesFile = versionMapLocation;
>          this.serverInfo = serverInfo;
>      }
>  
> +
> +    public String getArtifactAliasesFile() {
> +        return artifactAliasesFile;
> +    }
> +
>      private static Map<Artifact, Artifact>
> buildExplicitResolution(String versionMapLocation, ServerInfo
> serverInfo) throws IOException {
>          if (versionMapLocation == null) {
>              return null;
> @@ -123,7 +128,7 @@
>      public synchronized void addAliases(Properties properties)
> throws IOException {
>          Map<Artifact, Artifact> explicitResolutions =
> propertiesToArtifactMap(properties);
>          getExplicitResolution().putAll(explicitResolutions);
> -        saveExplicitResolution(getExplicitResolution(),
> versionMapLocation, serverInfo);
> +        saveExplicitResolution(getExplicitResolution(),
> artifactAliasesFile, serverInfo);
>      }
>  
>      public static final GBeanInfo GBEAN_INFO;
> 
> Added:
>
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolver.java
> URL:
>
http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolver.java?rev=601152&view=auto
>
==============================================================================
> ---
>
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolver.java
> (added)
> +++
>
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolver.java
> Tue Dec  4 15:49:03 2007
> @@ -0,0 +1,28 @@
> +/*
> + * 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.
> + */
> +
> +
> +package org.apache.geronimo.system.resolver;
> +
> +/**
> + * @version $Rev:$ $Date:$
> + */
> +public interface LocalAliasedArtifactResolver extends
> AliasedArtifactResolver {
> +    String getArtifactAliasesFile();
> +}
> 
> Propchange:
>
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolver.java
>
------------------------------------------------------------------------------
>     svn:eol-style = native
> 
> Propchange:
>
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolver.java
>
------------------------------------------------------------------------------
>     svn:keywords = Date Revision
> 
> Propchange:
>
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/LocalAliasedArtifactResolver.java
>
------------------------------------------------------------------------------
>     svn:mime-type = text/plain
> 
> Modified:
>
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
> URL:
>
http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java?rev=601152&r1=601151&r2=601152&view=diff
>
==============================================================================
> ---
>
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
> (original)
> +++
>
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
> Tue Dec  4 15:49:03 2007
> @@ -74,7 +74,7 @@
>          }
>  
>          baseURI = base.toURI();
> -        baseServer = deriveBaseServer();
> +        baseServer = deriveBaseServer(useSystemProperties);
>          baseServerURI = baseServer.toURI();
>          if (useSystemProperties) {
>              System.setProperty(HOME_DIR_SYS_PROP,
> base.getAbsolutePath());
> @@ -161,16 +161,16 @@
>          return new File(baseDir, filename);
>      }
>  
> -    private File deriveBaseServer() {
> +    private File deriveBaseServer(boolean useSystemProperties) {
>          File baseServerDir;
>          
>          // first check if the base server directory has been
> provided via
>          // system property override.
>          String baseServerDirPath =
> System.getProperty(SERVER_DIR_SYS_PROP);
> -        if (null == baseServerDirPath) {
> +        if (!useSystemProperties || null == baseServerDirPath) {
>              // then check if a server name has been provided
>              String serverName =
> System.getProperty(SERVER_NAME_SYS_PROP);
> -            if (null == serverName) {
> +            if (!useSystemProperties || null == serverName) {
>                  // default base server directory.
>                  baseServerDir = base;
>              } else {
> 
> Added:
>
geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/ArchiverGBeanTest.java
> URL:
>
http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/ArchiverGBeanTest.java?rev=601152&view=auto
>
==============================================================================
> ---
>
geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/ArchiverGBeanTest.java
> (added)
> +++
>
geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/ArchiverGBeanTest.java
> Tue Dec  4 15:49:03 2007
> @@ -0,0 +1,67 @@
> +/*
> + * 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.
> 
=== message truncated ===



      ____________________________________________________________________________________
Be a better pen pal. 
Text or chat with friends inside Yahoo! Mail. See how.  http://overview.mail.yahoo.com/

Mime
View raw message