You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2013/12/24 13:52:21 UTC
svn commit: r1553268 - in
/ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/src/org/apache/ant/antdsl:
ResolveBuildTask.java UpdateBuildTask.java
Author: hibou
Date: Tue Dec 24 12:52:21 2013
New Revision: 1553268
URL: http://svn.apache.org/r1553268
Log:
fix weird merge
Modified:
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/src/org/apache/ant/antdsl/ResolveBuildTask.java
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/src/org/apache/ant/antdsl/UpdateBuildTask.java
Modified: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/src/org/apache/ant/antdsl/ResolveBuildTask.java
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/src/org/apache/ant/antdsl/ResolveBuildTask.java?rev=1553268&r1=1553267&r2=1553268&view=diff
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/src/org/apache/ant/antdsl/ResolveBuildTask.java (original)
+++ ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/src/org/apache/ant/antdsl/ResolveBuildTask.java Tue Dec 24 12:52:21 2013
@@ -27,32 +27,3 @@ class ResolveBuildTask extends Task {
AntPathManager.resolveBuild(getProject(), this);
}
}
-/*
- * 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.ant.antdsl;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-class ResolveBuildTask extends Task {
-
- @Override
- public void execute() throws BuildException {
- AntPathManager.resolveBuild(getProject(), this);
- }
-}
Modified: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/src/org/apache/ant/antdsl/UpdateBuildTask.java
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/src/org/apache/ant/antdsl/UpdateBuildTask.java?rev=1553268&r1=1553267&r2=1553268&view=diff
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/src/org/apache/ant/antdsl/UpdateBuildTask.java (original)
+++ ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/src/org/apache/ant/antdsl/UpdateBuildTask.java Tue Dec 24 12:52:21 2013
@@ -27,32 +27,3 @@ class UpdateBuildTask extends Task {
AntPathManager.updateBuild(getProject(), this);
}
}
-/*
- * 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.ant.antdsl;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-class UpdateBuildTask extends Task {
-
- @Override
- public void execute() throws BuildException {
- AntPathManager.updateBuild(getProject(), this);
- }
-}