1.1 --- a/nbbuild/cluster.properties	Mon Apr 14 12:14:26 2014 +0000
     1.2 +++ b/nbbuild/cluster.properties	Mon Apr 14 16:46:08 2014 +0200
     1.3 @@ -123,6 +123,17 @@
     1.4          ${clusters.config.enterprise.list},\
     1.5          nb.cluster.mobility
     1.6  
     1.7 +clusters.config.jdev.list=\
     1.8 +        ${clusters.config.platform.list},\
     1.9 +        nb.cluster.ide,\
    1.10 +        nb.cluster.extide,\
    1.11 +        nb.cluster.websvccommon,\
    1.12 +        nb.cluster.java,\
    1.13 +        nb.cluster.profiler,\
    1.14 +        nb.cluster.jira,\
    1.15 +        nb.cluster.teamserver,\
    1.16 +        nb.cluster.odcs
    1.17 +
    1.18  clusters.config.bloated.list=\
    1.19          nb.cluster.identity,\
    1.20          ${clusters.config.full.list}
    1.21 @@ -131,15 +142,21 @@
    1.22  # For technical reasons, nb.cluster.experimental is a superset of nb.cluster.betauc and nb.cluster.stableuc, so cannot list at once:
    1.23  clusters.config.experimental.list=\
    1.24          ${clusters.config.bloated.list},\
    1.25 +        nb.cluster.jira,\
    1.26 +        nb.cluster.teamserver,\
    1.27          nb.cluster.experimental
    1.28  
    1.29  clusters.config.stableuc.list=\
    1.30          ${clusters.config.full.list},\
    1.31 +        nb.cluster.jira,\
    1.32 +        nb.cluster.teamserver,\
    1.33          nb.cluster.stableuc
    1.34  # could put ergonomics last, but undesirable to also do so for clusters.config.experimental.list, so exclude stableuc from ergonomics processing
    1.35  
    1.36  clusters.config.betauc.list=\
    1.37          ${clusters.config.full.list},\
    1.38 +        nb.cluster.jira,\
    1.39 +        nb.cluster.teamserver,\
    1.40          nb.cluster.betauc
    1.41  
    1.42  clusters.config.minimal.list=\
    1.43 @@ -999,6 +1016,62 @@
    1.44          dlight.remote.impl,\
    1.45          remotefs.versioning
    1.46  
    1.47 +nb.cluster.jira.dir=extra
    1.48 +nb.cluster.jira.depends=\
    1.49 +        nb.cluster.harness,\
    1.50 +        nb.cluster.platform,\
    1.51 +        nb.cluster.ide
    1.52 +nb.cluster.jira=\
    1.53 +        c.atlassian.connector.eclipse.commons.core,\
    1.54 +        c.atlassian.connector.eclipse.jira.core,\
    1.55 +        c.atlassian.connector.eclipse.jira.core.rest,\
    1.56 +        c.google.guava,\
    1.57 +        c.s.jersey,\
    1.58 +        c.s.mail.javax.mail,\
    1.59 +        javax.servlet,\
    1.60 +        javax.wsdl,\
    1.61 +        javax.xml.rpc,\
    1.62 +        javax.xml.soap,\
    1.63 +        jira,\
    1.64 +        jira.rest,\
    1.65 +        jira.xmlrpc,\
    1.66 +        libs.jira.rest,\
    1.67 +        o.apache.axis,\
    1.68 +        o.apache.commons.discovery,\
    1.69 +        o.codehaus.jettison,\
    1.70 +        o.eclipse.mylyn.commons.soap,\
    1.71 +        o.eclipse.mylyn.monitor.ui.dummy,\
    1.72 +        o.joda.time
    1.73 +
    1.74 +# can be joined with odcs once odcs is on uc (now needed both for kenai and odcs while only kenai is in stableuc)
    1.75 +nb.cluster.teamserver.dir=extra
    1.76 +nb.cluster.teamserver.depends=\
    1.77 +        nb.cluster.harness,\
    1.78 +        nb.cluster.platform,\
    1.79 +        nb.cluster.ide
    1.80 +nb.cluster.teamserver=team.server
    1.81 +
    1.82 +nb.cluster.odcs.dir=extra
    1.83 +nb.cluster.odcs.depends=\
    1.84 +        nb.cluster.harness,\
    1.85 +        nb.cluster.platform,\
    1.86 +        nb.cluster.ide
    1.87 +nb.cluster.odcs=\
    1.88 +        c.tasktop.c2c.server.cloud.api,\
    1.89 +        c.tasktop.c2c.server.common.api,\
    1.90 +        c.tasktop.c2c.server.profile.api,\
    1.91 +        c.tasktop.c2c.server.scm.api,\
    1.92 +        c.tasktop.c2c.server.tasks.api,\
    1.93 +        c.tasktop.c2c.server.wiki.api,\
    1.94 +        o.codehaus.jackson.core,\
    1.95 +        o.codehaus.jackson.mapper,\
    1.96 +        odcs,\
    1.97 +        odcs.hudson,\
    1.98 +        odcs.tasks,\
    1.99 +        odcs.tasks.bridge,\
   1.100 +        odcs.ui,\
   1.101 +        odcs.versioning,\
   1.102 +        oracle.eclipse.tools.cloud.dev.tasks
   1.103  
   1.104  nb.cluster.stableuc.dir=extra
   1.105  nb.cluster.stableuc.depends=${clusters.config.full.list}
   1.106 @@ -1006,12 +1079,6 @@
   1.107          apisupport.apidocs,\
   1.108          avatar_js.project,\
   1.109          bugtracking.kenai,\
   1.110 -        c.atlassian.connector.eclipse.commons.core,\
   1.111 -        c.atlassian.connector.eclipse.jira.core,\
   1.112 -        c.atlassian.connector.eclipse.jira.core.rest,\
   1.113 -        c.google.guava,\
   1.114 -        c.s.jersey,\
   1.115 -        c.s.mail.javax.mail,\
   1.116          cloud.oracle,\
   1.117          db.mysql.sakila,\
   1.118          deployment.deviceanywhere,\
   1.119 @@ -1031,14 +1098,7 @@
   1.120          j2me.cdc.project.savaje,\
   1.121          j2me.cdc.project.semc,\
   1.122          j2me.cdc.project.sjmc,\
   1.123 -        javax.servlet,\
   1.124 -        javax.wsdl,\
   1.125 -        javax.xml.rpc,\
   1.126 -        javax.xml.soap,\
   1.127          jconsole,\
   1.128 -        jira,\
   1.129 -        jira.rest,\
   1.130 -        jira.xmlrpc,\
   1.131          jmx,\
   1.132          jmx.common,\
   1.133          junitlib,\
   1.134 @@ -1049,7 +1109,6 @@
   1.135          lib.cvsclient,\
   1.136          libs.aguiswinglayout,\
   1.137          libs.findbugs,\
   1.138 -        libs.jira.rest,\
   1.139          libs.junit4,\
   1.140          libs.oracle.cloud,\
   1.141          libs.ppawtlayout,\
   1.142 @@ -1070,19 +1129,12 @@
   1.143          mobility.project.bridge.impl,\
   1.144          mobility.svgcore,\
   1.145          mvd,\
   1.146 -        o.apache.axis,\
   1.147 -        o.apache.commons.discovery,\
   1.148          o.apache.tools.ant.module.docs,\
   1.149 -        o.codehaus.jettison,\
   1.150 -        o.eclipse.mylyn.commons.soap,\
   1.151 -        o.eclipse.mylyn.monitor.ui.dummy,\
   1.152 -        o.joda.time,\
   1.153  	o.n.swing.laf.dark,\
   1.154          otherlicenses/mobility.proguard,\
   1.155          profiler.loadgen,\
   1.156          svg.perseus,\
   1.157          swingapplib,\
   1.158 -        team.server,\
   1.159  	team.server.nb,\
   1.160          versioning.kenai,\
   1.161          versioning.system.cvss,\
   1.162 @@ -1366,4 +1418,3 @@
   1.163         contrib/json,\
   1.164         contrib/remote.project.finder,\
   1.165         contrib/remote.server
   1.166 -

     2.1 --- a/nbbuild/newbuild/init.sh	Mon Apr 14 12:14:26 2014 +0000
     2.2 +++ b/nbbuild/newbuild/init.sh	Mon Apr 14 16:46:08 2014 +0200
     2.3 @@ -72,12 +72,6 @@
     2.4      echo '</testsuite>' >>$FILE
     2.5  }
     2.6  
     2.7 -if [ -n "$JDEV_BUILD" ]; then
     2.8 -    export CLUSTER_CONFIG="-Dcluster.config=java"
     2.9 -else
    2.10 -    export CLUSTER_CONFIG=
    2.11 -fi
    2.12 -
    2.13  #NB_BRANCH default
    2.14  if [ -z ${NB_BRANCH} ]; then
    2.15      export NB_BRANCH=default

     3.1 --- a/nbbuild/newbuild/pack-all-components.sh	Mon Apr 14 12:14:26 2014 +0000
     3.2 +++ b/nbbuild/newbuild/pack-all-components.sh	Mon Apr 14 16:46:08 2014 +0200
     3.3 @@ -76,16 +76,12 @@
     3.4      cd $NB_ALL/nbbuild
     3.5  
     3.6      #Pack the distributions
     3.7 -    if [ -z $JDEV_BUILD ]; then
     3.8 -	ant zip-cluster-config -Dcluster.config=full -Dzip.name=$DIST_DIR/zip/$NAME.zip || exit 1    
     3.9 -        #ant zip-cluster-config -Dcluster.config=platform -Dzip.name=$DIST_DIR/zip/$NAME-platform.zip || exit 1
    3.10 -	ant zip-cluster-config -Dcluster.config=basic -Dzip.name=$DIST_DIR/zip/$NAME-javase.zip || exit 1
    3.11 -	ant zip-cluster-config -Dcluster.config=standard -Dzip.name=$DIST_DIR/zip/$NAME-javaee.zip || exit 1
    3.12 -	ant zip-cluster-config -Dcluster.config=php -Dzip.name=$DIST_DIR/zip/$NAME-php.zip || exit 1
    3.13 -	ant zip-cluster-config -Dcluster.config=cnd -Dzip.name=$DIST_DIR/zip/$NAME-cpp.zip || exit 1
    3.14 -    else
    3.15 -	ant zip-cluster-config -Dcluster.config=java -Dzip.name=$DIST_DIR/zip/$NAME.zip || exit 1
    3.16 -    fi
    3.17 +    ant zip-cluster-config -Dcluster.config=full -Dzip.name=$DIST_DIR/zip/$NAME.zip || exit 1    
    3.18 +    #ant zip-cluster-config -Dcluster.config=platform -Dzip.name=$DIST_DIR/zip/$NAME-platform.zip || exit 1
    3.19 +    ant zip-cluster-config -Dcluster.config=basic -Dzip.name=$DIST_DIR/zip/$NAME-javase.zip || exit 1
    3.20 +    ant zip-cluster-config -Dcluster.config=standard -Dzip.name=$DIST_DIR/zip/$NAME-javaee.zip || exit 1
    3.21 +    ant zip-cluster-config -Dcluster.config=php -Dzip.name=$DIST_DIR/zip/$NAME-php.zip || exit 1
    3.22 +    ant zip-cluster-config -Dcluster.config=cnd -Dzip.name=$DIST_DIR/zip/$NAME-cpp.zip || exit 1
    3.23  
    3.24      cd $NB_ALL/nbbuild/netbeans
    3.25