1.1 --- a/bpel.project/manifest.mf Fri Dec 05 21:01:53 2008 +0100
1.2 +++ b/bpel.project/manifest.mf Fri Dec 05 17:21:05 2008 -0500
1.3 @@ -1,6 +1,6 @@
1.4 Manifest-Version: 1.0
1.5 AutoUpdate-Show-In-Client: false
1.6 -OpenIDE-Module-Specification-Version: 1.3
1.7 +OpenIDE-Module-Specification-Version: 1.4
1.8 OpenIDE-Module: org.netbeans.modules.bpel.project
1.9 OpenIDE-Module-Layer: org/netbeans/modules/bpel/project/resources/layer.xml
1.10 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/bpel/project/resources/Bundle.properties
2.1 --- a/bpel.project/nbproject/project.xml Fri Dec 05 21:01:53 2008 +0100
2.2 +++ b/bpel.project/nbproject/project.xml Fri Dec 05 17:21:05 2008 -0500
2.3 @@ -51,7 +51,7 @@
2.4 <compile-dependency/>
2.5 <run-dependency>
2.6 <release-version>3</release-version>
2.7 - <specification-version>3.24.1.1</specification-version>
2.8 + <specification-version>3.34</specification-version>
2.9 </run-dependency>
2.10 </dependency>
2.11 <dependency>
3.1 --- a/bpel.project/src/org/netbeans/modules/bpel/project/BpelAntLogger.java Fri Dec 05 21:01:53 2008 +0100
3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3 @@ -1,111 +0,0 @@
3.4 -/*
3.5 - * The contents of this file are subject to the terms of the Common Development
3.6 - * and Distribution License (the License). You may not use this file except in
3.7 - * compliance with the License.
3.8 - *
3.9 - * You can obtain a copy of the License at http://www.netbeans.org/cddl.html
3.10 - * or http://www.netbeans.org/cddl.txt.
3.11 - *
3.12 - * When distributing Covered Code, include this CDDL Header Notice in each file
3.13 - * and include the License file at http://www.netbeans.org/cddl.txt.
3.14 - * If applicable, add the following below the CDDL Header, with the fields
3.15 - * enclosed by brackets [] replaced by your own identifying information:
3.16 - * "Portions Copyrighted [year] [name of copyright owner]"
3.17 - *
3.18 - * The Original Software is NetBeans. The Initial Developer of the Original
3.19 - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
3.20 - * Microsystems, Inc. All Rights Reserved.
3.21 - */
3.22 -
3.23 -package org.netbeans.modules.bpel.project;
3.24 -
3.25 -import java.io.File;
3.26 -import java.io.IOException;
3.27 -
3.28 -import org.apache.tools.ant.module.spi.AntEvent;
3.29 -import org.apache.tools.ant.module.spi.AntLogger;
3.30 -import org.apache.tools.ant.module.spi.AntSession;
3.31 -import org.netbeans.api.project.Project;
3.32 -import org.netbeans.api.project.ProjectManager;
3.33 -import org.openide.ErrorManager;
3.34 -import org.openide.filesystems.FileObject;
3.35 -import org.openide.filesystems.FileUtil;
3.36 -
3.37 -/**
3.38 - * @author radval
3.39 - *
3.40 - * To change the template for this generated type comment go to
3.41 - * Window - Preferences - Java - Code Generation - Code and Comments
3.42 - */
3.43 -public class BpelAntLogger extends AntLogger {
3.44 -
3.45 - public boolean interestedInSession(AntSession session) {
3.46 - // Even if the initiating project is not a J2SEProject, suppress these messages.
3.47 - // However disable our tricks when running at VERBOSE or higher.
3.48 - return session.getVerbosity() <= AntEvent.LOG_INFO;
3.49 - }
3.50 -
3.51 - private static boolean isJ2SEProject(File dir) {
3.52 - FileObject projdir = FileUtil.toFileObject(FileUtil.normalizeFile(dir));
3.53 - try {
3.54 - Project proj = ProjectManager.getDefault().findProject(projdir);
3.55 - if (proj != null) {
3.56 - // Check if it is a J2SEProject.
3.57 - return proj.getLookup().lookup(BpelproProject.class) != null;
3.58 - }
3.59 - } catch (IOException e) {
3.60 - ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
3.61 - }
3.62 - return false;
3.63 - }
3.64 -
3.65 - public boolean interestedInScript(File script, AntSession session) {
3.66 - if (script.getName().equals("build-impl.xml")) { // NOI18N
3.67 - File parent = script.getParentFile();
3.68 - if (parent != null && parent.getName().equals("nbproject")) { // NOI18N
3.69 - File parent2 = parent.getParentFile();
3.70 - if (parent2 != null) {
3.71 - return isJ2SEProject(parent2);
3.72 - }
3.73 - }
3.74 - }
3.75 - // Was not a J2SEProject's nbproject/build-impl.xml; ignore it.
3.76 - return false;
3.77 - }
3.78 -
3.79 - public String[] interestedInTargets(AntSession session) {
3.80 - return AntLogger.ALL_TARGETS;
3.81 - }
3.82 -
3.83 - public String[] interestedInTasks(AntSession session) {
3.84 - // XXX will eventually need them all anyway; as is, could list just javac
3.85 - return AntLogger.ALL_TASKS;
3.86 - }
3.87 -
3.88 - public int[] interestedInLogLevels(AntSession session) {
3.89 - return new int[] {
3.90 - AntEvent.LOG_WARN,
3.91 - };
3.92 - }
3.93 -
3.94 - public void taskFinished(AntEvent event) {
3.95 - if ("javac".equals(event.getTaskName())) { // NOI18N
3.96 - Throwable t = event.getException();
3.97 - AntSession session = event.getSession();
3.98 - if (t != null && !session.isExceptionConsumed(t)) {
3.99 - // Some error was thrown from build-impl.xml#compile. Ignore it; generally
3.100 - // it will have been a compilation error which we do not wish to show.
3.101 - session.consumeException(t);
3.102 - }
3.103 - }
3.104 - }
3.105 -
3.106 - public void messageLogged(AntEvent event) {
3.107 - // #43968 - filter out following message
3.108 - if (!event.isConsumed() && event.getLogLevel() == AntEvent.LOG_WARN &&
3.109 - event.getMessage().startsWith("Trying to override old definition of " + // NOI18N
3.110 - "task http://www.netbeans.org/ns/j2se-project/")) { // NOI18N
3.111 - event.consume();
3.112 - }
3.113 - }
3.114 -}