You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/05/12 00:24:24 UTC
svn commit: r655380 -
/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
Author: olamy
Date: Sun May 11 15:24:23 2008
New Revision: 655380
URL: http://svn.apache.org/viewvc?rev=655380&view=rev
Log:
[CONTINUUM-1742] Duplicate installations (environment variables) in Profile are accepted
Modified:
continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java?rev=655380&r1=655379&r2=655380&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java Sun May 11 15:24:23 2008
@@ -38,24 +38,6 @@
import com.opensymphony.xwork.Preparable;
-/*
- * 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.
- */
/**
* @author <a href="mailto:olamy@codehaus.org">olamy</a>
* @version $Id$
@@ -201,12 +183,12 @@
// Webwork setter/getter
// -------------------------------------------------------
- public List getProfiles()
+ public List<Profile> getProfiles()
{
return profiles;
}
- public void setProfiles( List profiles )
+ public void setProfiles( List<Profile> profiles )
{
this.profiles = profiles;
}
@@ -228,6 +210,11 @@
{
this.allInstallations = installationService.getAllInstallations();
}
+ // CONTINUUM-1742 (olamy) don't display already attached en var
+ if (this.profile != null)
+ {
+ this.allInstallations.removeAll( this.profile.getEnvironmentVariables() );
+ }
return allInstallations;
}
Re: svn commit: r655380 - /continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
Posted by Olivier Lamy <ol...@apache.org>.
nope.
Still here (
https://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
).
I have moved before package too after.
--
Olivier
2008/5/12 Wendy Smoak <ws...@gmail.com>:
> Looks like the license inadvertently got removed in this commit. -Wendy
>
> On Sun, May 11, 2008 at 3:24 PM, <ol...@apache.org> wrote:
> > Author: olamy
> > Date: Sun May 11 15:24:23 2008
> > New Revision: 655380
> >
> > URL: http://svn.apache.org/viewvc?rev=655380&view=rev
> > Log:
> > [CONTINUUM-1742] Duplicate installations (environment variables) in
> Profile are accepted
> >
> >
> > Modified:
> >
> continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
> >
> > Modified:
> continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
> > URL:
> http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java?rev=655380&r1=655379&r2=655380&view=diff
> >
> ==============================================================================
> > ---
> continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
> (original)
> > +++
> continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
> Sun May 11 15:24:23 2008
> > @@ -38,24 +38,6 @@
> >
> > import com.opensymphony.xwork.Preparable;
> >
> > -/*
> > - * 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.
> > - */
> > /**
> > * @author <a href="mailto:olamy@codehaus.org">olamy</a>
> > * @version $Id$
> > @@ -201,12 +183,12 @@
> > // Webwork setter/getter
> > // -------------------------------------------------------
> >
> > - public List getProfiles()
> > + public List<Profile> getProfiles()
> > {
> > return profiles;
> > }
> >
> > - public void setProfiles( List profiles )
> > + public void setProfiles( List<Profile> profiles )
> > {
> > this.profiles = profiles;
> > }
> > @@ -228,6 +210,11 @@
> > {
> > this.allInstallations =
> installationService.getAllInstallations();
> > }
> > + // CONTINUUM-1742 (olamy) don't display already attached en var
> > + if (this.profile != null)
> > + {
> > + this.allInstallations.removeAll(
> this.profile.getEnvironmentVariables() );
> > + }
> > return allInstallations;
> > }
> >
> >
> >
> >
>
Re: svn commit: r655380 - /continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
Posted by Wendy Smoak <ws...@gmail.com>.
Looks like the license inadvertently got removed in this commit. -Wendy
On Sun, May 11, 2008 at 3:24 PM, <ol...@apache.org> wrote:
> Author: olamy
> Date: Sun May 11 15:24:23 2008
> New Revision: 655380
>
> URL: http://svn.apache.org/viewvc?rev=655380&view=rev
> Log:
> [CONTINUUM-1742] Duplicate installations (environment variables) in Profile are accepted
>
>
> Modified:
> continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
>
> Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java?rev=655380&r1=655379&r2=655380&view=diff
> ==============================================================================
> --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java (original)
> +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java Sun May 11 15:24:23 2008
> @@ -38,24 +38,6 @@
>
> import com.opensymphony.xwork.Preparable;
>
> -/*
> - * 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.
> - */
> /**
> * @author <a href="mailto:olamy@codehaus.org">olamy</a>
> * @version $Id$
> @@ -201,12 +183,12 @@
> // Webwork setter/getter
> // -------------------------------------------------------
>
> - public List getProfiles()
> + public List<Profile> getProfiles()
> {
> return profiles;
> }
>
> - public void setProfiles( List profiles )
> + public void setProfiles( List<Profile> profiles )
> {
> this.profiles = profiles;
> }
> @@ -228,6 +210,11 @@
> {
> this.allInstallations = installationService.getAllInstallations();
> }
> + // CONTINUUM-1742 (olamy) don't display already attached en var
> + if (this.profile != null)
> + {
> + this.allInstallations.removeAll( this.profile.getEnvironmentVariables() );
> + }
> return allInstallations;
> }
>
>
>
>