Author: jleroux
Date: Sun May 27 15:47:32 2012
New Revision: 1343064
URL: http://svn.apache.org/viewvc?rev=1343064&view=rev
Log:
Closes "Move SHARK to Attic" https://issues.apache.org/jira/browse/OFBIZ-4795
Removed:
ofbiz/trunk/specialpurpose/shark/
Modified:
ofbiz/trunk/debian/move-files.pl
ofbiz/trunk/framework/base/config/both-containers.xml
ofbiz/trunk/framework/base/config/ofbiz-containers.xml
ofbiz/trunk/framework/base/config/rmi-containers.xml
ofbiz/trunk/framework/base/config/test-containers.xml
ofbiz/trunk/framework/service/config/serviceengine.xml
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java
ofbiz/trunk/macros.xml
Modified: ofbiz/trunk/debian/move-files.pl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/debian/move-files.pl?rev=1343064&r1=1343063&r2=1343064&view=diff
==============================================================================
--- ofbiz/trunk/debian/move-files.pl (original)
+++ ofbiz/trunk/debian/move-files.pl Sun May 27 15:47:32 2012
@@ -25,8 +25,8 @@ use File::Copy;
my %dirs;
my %bases = (
- 'ofbiz' => 'debian/ofbiz',
- 'specialpurpose' => 'debian/ofbiz-specialpurpose',
+ 'ofbiz' => 'debian/ofbiz',
+ 'specialpurpose' => 'debian/ofbiz-specialpurpose',
);
my $appDirsRe = qw/(applications|framework|specialpurpose)/;
@@ -48,7 +48,6 @@ framework/example/webapp/webapp.txt
framework/logs/README
framework/images/webapp/images/catalog/dirholder.txt
framework/appserver/README
-framework/shark/lib/README
framework/data/README
README
.classpath
@@ -66,132 +65,132 @@ my @unknown;
my %scripts;
sub basename($) {
- my $target = $_[0];
- $target =~ s,/[^/]+$,,;
- return $target;
+ my $target = $_[0];
+ $target =~ s,/[^/]+$,,;
+ return $target;
}
sub _mkdir($) {
- return mkdir($_[0]) || !system('mkdir', '-p', $_[0]);
+ return mkdir($_[0]) || !system('mkdir', '-p', $_[0]);
}
sub copylink($$$) {
- my ($base, $destdir, $file) = @_;
- my $target = "$base$destdir/$file";
- #print("Symlinking ($file) ($target)\n");
- if (-f $file) {
- _mkdir(basename($target)) || die("a");
- link($file, $target) || die("b");
- } else {
- _mkdir($target) || die("c");
- }
- my $symlink = "$base/usr/share/ofbiz/$file";
- _mkdir(basename($symlink));
- symlink("$destdir/$file", $symlink) || die("f: $symlink: $!");
+ my ($base, $destdir, $file) = @_;
+ my $target = "$base$destdir/$file";
+ #print("Symlinking ($file) ($target)\n");
+ if (-f $file) {
+ _mkdir(basename($target)) || die("a");
+ link($file, $target) || die("b");
+ } else {
+ _mkdir($target) || die("c");
+ }
+ my $symlink = "$base/usr/share/ofbiz/$file";
+ _mkdir(basename($symlink));
+ symlink("$destdir/$file", $symlink) || die("f: $symlink: $!");
}
system('rm', '-rf', 'debian/ofbiz', 'debian/ofbiz-specialpurpose');
open(FIND, '-|', qw(find -not -path */.git/* -not -name .gitignore -printf %P\0)) ||
die("Couldn't run find");
$/ = "\0";
while (<FIND>) {
- chomp;
- #print("{$_}\n");
- next if (m,^debian/,);
- next if (exists($ignore{$_}));
-# next if
(m,^(LICENSE|NOTICE|OPTIONAL_LIBRARIES|ant(\.bat)?|\.(project|classpath)|(stop|start)ofbiz\.sh|startofbiz\.bat|(ij|rc)\.ofbiz)$,);
- next if (m,(^|.*/)build\.xml$,);
- #print("1\n");
- next if (m,^$appDirsRe/[^/]+/(build/classes|src|testdef)/.*,);
- next if (m,^$appDirsRe/[^/]+/build/lib/[^/]+-test\.jar$,);
- next if (m,^runtime/(catalina/work|data/derby|logs)/.*,);
- next if (m,^framework/appserver/templates(|/.*)$,);
- next if (m,^\.(hg|pc)(|/.*),);
- #print("2\n");
- my $type = undef;
- if ($_ eq 'framework/entity/config/entityengine.xml') {
- $type = 'ucf';
- } elsif (-f m,(^|.*/)[^/]+\.css$,) {
- $type = 'conffile';
- } elsif
(m,^$appDirsRe/[^/]+/webapp/.*/WEB-INF/(controller|web|regions)\.xml$,) {
- $type = 'conffile';
- } elsif ($_ eq
'specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/facility-controller.xml') {
- $type = 'conffile';
- } elsif ($_ eq 'runtime/data/derby.properties') {
- $type = 'conffile';
- } elsif (m,^$appDirsRe/[^/]+/email/[^/]+/[^/]+\.ftl$,) {
- $type = 'conffile';
- } elsif (m,^$appDirsRe/[^/]+/data/[^/]+\.xml$,) {
- $type = 'conffile';
- } elsif (m,^$appDirsRe/[^/]+/ofbiz-component\.xml$,) {
- $type = 'conffile';
- } elsif (m,^$appDirsRe/component-load\.xml$,) {
- $type = 'conffile';
- } elsif (-f && m,^$appDirsRe/[^/]+/servicedef/services.*\.xml$,) {
- $type = 'conffile';
- } elsif (-f &&
m,^$appDirsRe/[^/]+/(dtd|entitydef|script|servicedef|widget)/.*$,) {
- $type = 'code';
- } elsif
(m,^$appDirsRe/[^/]+/webapp/.*/[^/]+(\.(bsh|ftl|jsp|gif|htc|ico|jar|jpg|js|png)|(Forms?|Menus)\.xml)$,)
{
- $type = 'code';
- } elsif (m,^$appDirsRe/[^/]+/webapp/.*/WEB-INF/[^/]+\.tld$,) {
- $type = 'code';
- } elsif (-f && m,^$appDirsRe/[^/]+/(config|templates|fieldtype)/.*$,) {
- $type = 'conffile';
- } elsif (m,^$appDirsRe/[^/]+/(build/lib/[^/]+\.jar|lib/.*\.jar)$,) {
- $type = 'code';
- } elsif (m,^framework/common/webcommon/.*\.ftl$,) {
- $type = 'code';
- } elsif (-f && m,^specialpurpose/pos/screens/.*$,) {
- $type = 'code';
- } elsif ($_ eq 'startofbiz.sh') {
- $type = 'conffile';
- } elsif ($_ eq 'applications/content/template/survey/genericsurvey.ftl') {
- $type = 'code';
- } elsif ($_ eq 'ofbiz.jar') {
- $type = 'code';
- } elsif (-f && m,^runtime/(logs|catalina|data)/README$,) {
- next;
- } elsif ($_ eq 'runtime/catalina/catalina-users.xml') {
- $type = 'varlib';
- } elsif (m,^runtime/catalina/[^/]+$,) {
- $type = 'varcache';
- } elsif (-d && $_ eq 'runtime/logs') {
- $type = 'varlog';
- } elsif (m,^runtime/logs/.*$,) {
- next;
- } elsif (-d && m,^runtime/tmp$,) {
- $type = 'varlib';
- } elsif (m,^runtime/(data|output)/.*$,) {
- $type = 'varlib';
- } elsif (-f) {
- $type = 'code';
- } elsif ($_ eq 'rc.ofbiz.for.debian') {
- next;
- } else {
- next;
- }
- my $pkg;
- if (m,^specialpurpose/.*,) {
- $pkg = 'ofbiz-specialpurpose';
- } elsif (m,^applications/.*,) {
- $pkg = 'ofbiz-applications';
- } else {
- $pkg = 'ofbiz-framework';
- }
- my $base = 'debian/' . $pkg;
- my $file = $_;
- print(STDERR "$type: $file\n") if ($file =~ m/^.*runtime.*/);
- if ($type eq 'code') {
- my $target = "$base/usr/share/ofbiz/$file";
- #print("Copying ($file) ($target)\n");
- _mkdir(basename($target)) || die("1");
- link($file, $target) || die("2");
- } elsif ($type eq 'conffile') { # && $file =~
m,^.*/(ofbiz-component|component-load|data/.*)\.xml$,) {
- copylink($base, '/etc/ofbiz', $file);
- } elsif ($type eq 'ucf') {
- copylink($base, '/etc/ofbiz', $file);
- _mkdir(basename("$base/usr/share/ofbiz/ucf/$file"));
- rename("$base/etc/ofbiz/$file", "$base/usr/share/ofbiz/ucf/$file");
- my $postinst = <<_EOF_;
+ chomp;
+ #print("{$_}\n");
+ next if (m,^debian/,);
+ next if (exists($ignore{$_}));
+# next if
(m,^(LICENSE|NOTICE|OPTIONAL_LIBRARIES|ant(\.bat)?|\.(project|classpath)|(stop|start)ofbiz\.sh|startofbiz\.bat|(ij|rc)\.ofbiz)$,);
+ next if (m,(^|.*/)build\.xml$,);
+ #print("1\n");
+ next if (m,^$appDirsRe/[^/]+/(build/classes|src|testdef)/.*,);
+ next if (m,^$appDirsRe/[^/]+/build/lib/[^/]+-test\.jar$,);
+ next if (m,^runtime/(catalina/work|data/derby|logs)/.*,);
+ next if (m,^framework/appserver/templates(|/.*)$,);
+ next if (m,^\.(hg|pc)(|/.*),);
+ #print("2\n");
+ my $type = undef;
+ if ($_ eq 'framework/entity/config/entityengine.xml') {
+ $type = 'ucf';
+ } elsif (-f m,(^|.*/)[^/]+\.css$,) {
+ $type = 'conffile';
+ } elsif
(m,^$appDirsRe/[^/]+/webapp/.*/WEB-INF/(controller|web|regions)\.xml$,) {
+ $type = 'conffile';
+ } elsif ($_ eq
'specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/facility-controller.xml') {
+ $type = 'conffile';
+ } elsif ($_ eq 'runtime/data/derby.properties') {
+ $type = 'conffile';
+ } elsif (m,^$appDirsRe/[^/]+/email/[^/]+/[^/]+\.ftl$,) {
+ $type = 'conffile';
+ } elsif (m,^$appDirsRe/[^/]+/data/[^/]+\.xml$,) {
+ $type = 'conffile';
+ } elsif (m,^$appDirsRe/[^/]+/ofbiz-component\.xml$,) {
+ $type = 'conffile';
+ } elsif (m,^$appDirsRe/component-load\.xml$,) {
+ $type = 'conffile';
+ } elsif (-f && m,^$appDirsRe/[^/]+/servicedef/services.*\.xml$,) {
+ $type = 'conffile';
+ } elsif (-f &&
m,^$appDirsRe/[^/]+/(dtd|entitydef|script|servicedef|widget)/.*$,) {
+ $type = 'code';
+ } elsif
(m,^$appDirsRe/[^/]+/webapp/.*/[^/]+(\.(bsh|ftl|jsp|gif|htc|ico|jar|jpg|js|png)|(Forms?|Menus)\.xml)$,)
{
+ $type = 'code';
+ } elsif (m,^$appDirsRe/[^/]+/webapp/.*/WEB-INF/[^/]+\.tld$,) {
+ $type = 'code';
+ } elsif (-f && m,^$appDirsRe/[^/]+/(config|templates|fieldtype)/.*$,) {
+ $type = 'conffile';
+ } elsif (m,^$appDirsRe/[^/]+/(build/lib/[^/]+\.jar|lib/.*\.jar)$,) {
+ $type = 'code';
+ } elsif (m,^framework/common/webcommon/.*\.ftl$,) {
+ $type = 'code';
+ } elsif (-f && m,^specialpurpose/pos/screens/.*$,) {
+ $type = 'code';
+ } elsif ($_ eq 'startofbiz.sh') {
+ $type = 'conffile';
+ } elsif ($_ eq 'applications/content/template/survey/genericsurvey.ftl') {
+ $type = 'code';
+ } elsif ($_ eq 'ofbiz.jar') {
+ $type = 'code';
+ } elsif (-f && m,^runtime/(logs|catalina|data)/README$,) {
+ next;
+ } elsif ($_ eq 'runtime/catalina/catalina-users.xml') {
+ $type = 'varlib';
+ } elsif (m,^runtime/catalina/[^/]+$,) {
+ $type = 'varcache';
+ } elsif (-d && $_ eq 'runtime/logs') {
+ $type = 'varlog';
+ } elsif (m,^runtime/logs/.*$,) {
+ next;
+ } elsif (-d && m,^runtime/tmp$,) {
+ $type = 'varlib';
+ } elsif (m,^runtime/(data|output)/.*$,) {
+ $type = 'varlib';
+ } elsif (-f) {
+ $type = 'code';
+ } elsif ($_ eq 'rc.ofbiz.for.debian') {
+ next;
+ } else {
+ next;
+ }
+ my $pkg;
+ if (m,^specialpurpose/.*,) {
+ $pkg = 'ofbiz-specialpurpose';
+ } elsif (m,^applications/.*,) {
+ $pkg = 'ofbiz-applications';
+ } else {
+ $pkg = 'ofbiz-framework';
+ }
+ my $base = 'debian/' . $pkg;
+ my $file = $_;
+ print(STDERR "$type: $file\n") if ($file =~ m/^.*runtime.*/);
+ if ($type eq 'code') {
+ my $target = "$base/usr/share/ofbiz/$file";
+ #print("Copying ($file) ($target)\n");
+ _mkdir(basename($target)) || die("1");
+ link($file, $target) || die("2");
+ } elsif ($type eq 'conffile') { # && $file =~
m,^.*/(ofbiz-component|component-load|data/.*)\.xml$,) {
+ copylink($base, '/etc/ofbiz', $file);
+ } elsif ($type eq 'ucf') {
+ copylink($base, '/etc/ofbiz', $file);
+ _mkdir(basename("$base/usr/share/ofbiz/ucf/$file"));
+ rename("$base/etc/ofbiz/$file", "$base/usr/share/ofbiz/ucf/$file");
+ my $postinst = <<_EOF_;
trap 'rm -f "\$tmpconffile"' EXIT
tmpconffile=`tempfile -m 644`
munge_conffile "\$tmpconffile" "$file"
@@ -200,33 +199,33 @@ ucfr ofbiz /etc/ofbiz/$file
rm -f "\$tmpconffile"
trap '' EXIT
_EOF_
- push(@{$scripts{$pkg}->{'postinst'}->{'configure'}}, $postinst);
- my $postrm = <<_EOF_;
+ push(@{$scripts{$pkg}->{'postinst'}->{'configure'}}, $postinst);
+ my $postrm = <<_EOF_;
for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist; do rm -f
/etc/ofbiz/$file\$ext; done
rm -f /etc/ofbiz/$file
if which ucf >/dev/null; then ucf --debconf-ok --purge /etc/ofbiz/$file; fi
if which ucfr >/dev/null; then ucfr --purge ofbiz /etc/ofbiz/$file; fi
_EOF_
- push(@{$scripts{$pkg}->{'postrm'}->{'purge'}}, $postrm);
- } elsif ($type =~ m/^var(cache|lib|log|tmp)$/) {
- my $new = "/var/$1/ofbiz";
- copylink($base, $new, $file);
- my $postrm = <<_EOF_;
+ push(@{$scripts{$pkg}->{'postrm'}->{'purge'}}, $postrm);
+ } elsif ($type =~ m/^var(cache|lib|log|tmp)$/) {
+ my $new = "/var/$1/ofbiz";
+ copylink($base, $new, $file);
+ my $postrm = <<_EOF_;
if dpkg-statoverride --list "$new/$file" > /dev/null; then dpkg-statoverride --remove
"$new/$file"; fi
rm -rf "$new/$file"
_EOF_
- push(@{$scripts{$pkg}->{'postrm'}->{'purge'}}, $postrm);
- my $postinst = <<_EOF_;
+ push(@{$scripts{$pkg}->{'postrm'}->{'purge'}}, $postrm);
+ my $postinst = <<_EOF_;
if ! dpkg-statoverride --list "$new/$file" > /dev/null; then
- dpkg-statoverride --add ofbiz ofbiz 2775 "$new/$file"
- chown ofbiz:ofbiz "$new/$file"
- chmod 2755 "$new/$file"
+ dpkg-statoverride --add ofbiz ofbiz 2775 "$new/$file"
+ chown ofbiz:ofbiz "$new/$file"
+ chmod 2755 "$new/$file"
fi
_EOF_
- push(@{$scripts{$pkg}->{'postinst'}->{'configure'}}, $postinst);
- } else {
- die("Unknown type($type) on file($file)");
- }
+ push(@{$scripts{$pkg}->{'postinst'}->{'configure'}}, $postinst);
+ } else {
+ die("Unknown type($type) on file($file)");
+ }
}
@@ -234,24 +233,24 @@ close(FIND);
my $postinst = '';
push(@{$scripts{'ofbiz-framework'}->{'postinst'}->{'configure'}}, $postinst);
foreach my $pkg (keys(%scripts)) {
- foreach my $script (keys(%{$scripts{$pkg}})) {
- open(SCRIPT, ">> debian/$pkg.$script.debhelper");
- print(SCRIPT "case \"\$1\" in\n");
- my $segments = $scripts{$pkg}->{$script};
- foreach my $arg (keys(%$segments)) {
- my $label = $arg;
- if ($label eq 'configure') {
- print(SCRIPT "\t(reconfigure|configure)\n");
- } elsif ($arg =~ m/[\s|]/) {
- print(SCRIPT "\t(\"$arg\")\n");
- } else {
- print(SCRIPT "\t($arg)\n");
- }
- print(SCRIPT join('', map("\t\t$_\n", split(/\n/, join("\n",
@{$segments->{$arg}})))));
- print(SCRIPT "\t;;\n");
- }
- print(SCRIPT "esac\n");
- close(SCRIPT);
- }
+ foreach my $script (keys(%{$scripts{$pkg}})) {
+ open(SCRIPT, ">> debian/$pkg.$script.debhelper");
+ print(SCRIPT "case \"\$1\" in\n");
+ my $segments = $scripts{$pkg}->{$script};
+ foreach my $arg (keys(%$segments)) {
+ my $label = $arg;
+ if ($label eq 'configure') {
+ print(SCRIPT "\t(reconfigure|configure)\n");
+ } elsif ($arg =~ m/[\s|]/) {
+ print(SCRIPT "\t(\"$arg\")\n");
+ } else {
+ print(SCRIPT "\t($arg)\n");
+ }
+ print(SCRIPT join('', map("\t\t$_\n", split(/\n/, join("\n",
@{$segments->{$arg}})))));
+ print(SCRIPT "\t;;\n");
+ }
+ print(SCRIPT "esac\n");
+ close(SCRIPT);
+ }
}
print(join('', map("$_\n", @unknown)));
Modified: ofbiz/trunk/framework/base/config/both-containers.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/both-containers.xml?rev=1343064&r1=1343063&r2=1343064&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/both-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/both-containers.xml Sun May 27 15:47:32
2012
@@ -76,19 +76,6 @@ under the License.
</container>
-->
- <!-- load Shark Workflow Engine -->
- <!-- NOTE: before uncommenting this please see the instructions in the
ofbiz/OPTIONAL_LIBRARIES file.
- <container name="shark-container"
class="org.ofbiz.shark.container.SharkContainer">
- <property name="engine-name" value="Shark"/>
- <property name="delegator-name" value="default"/>
- <property name="dispatcher-name" value="WFDispatcher"/>
- <property name="admin-user" value="system"/>
- <property name="admin-pass" value="ofbiz"/>
- <property name="iiop-host" value="127.0.0.1"/>
- <property name="iiop-port" value="2000"/>
- </container>
- -->
-
<!-- load catalina (tomcat) and all web applications -->
<container name="catalina-container"
class="org.ofbiz.catalina.container.CatalinaContainer">
<!-- static configuration for tomcat -->
Modified: ofbiz/trunk/framework/base/config/ofbiz-containers.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/ofbiz-containers.xml?rev=1343064&r1=1343063&r2=1343064&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Sun May 27 15:47:32
2012
@@ -74,19 +74,6 @@ under the License.
</container>
-->
- <!-- load Shark Workflow Engine -->
- <!-- NOTE: before uncommenting this please see the instructions in the
ofbiz/OPTIONAL_LIBRARIES file.
- <container name="shark-container"
class="org.ofbiz.shark.container.SharkContainer">
- <property name="engine-name" value="Shark"/>
- <property name="delegator-name" value="default"/>
- <property name="dispatcher-name" value="WFDispatcher"/>
- <property name="admin-user" value="system"/>
- <property name="admin-pass" value="ofbiz"/>
- <property name="iiop-host" value="127.0.0.1"/>
- <property name="iiop-port" value="2000"/>
- </container>
- -->
-
<!-- Load embedded Jackrabbit content repository. Since this container
depends
upon JNDI, it must be started after the naming-container container.-->
<container name="jcr-container" class="org.ofbiz.jcr.loader.JCRContainer">
Modified: ofbiz/trunk/framework/base/config/rmi-containers.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/rmi-containers.xml?rev=1343064&r1=1343063&r2=1343064&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/rmi-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/rmi-containers.xml Sun May 27 15:47:32
2012
@@ -69,17 +69,4 @@ under the License.
</container>
-->
- <!-- load Shark Workflow Engine -->
- <!-- NOTE: before uncommenting this please see the instructions in the
ofbiz/OPTIONAL_LIBRARIES file.
- <container name="shark-container"
class="org.ofbiz.shark.container.SharkContainer">
- <property name="engine-name" value="Shark"/>
- <property name="delegator-name" value="default"/>
- <property name="dispatcher-name" value="WFDispatcher"/>
- <property name="admin-user" value="system"/>
- <property name="admin-pass" value="ofbiz"/>
- <property name="iiop-host" value="127.0.0.1"/>
- <property name="iiop-port" value="2000"/>
- </container>
- -->
-
</ofbiz-containers>
Modified: ofbiz/trunk/framework/base/config/test-containers.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/test-containers.xml?rev=1343064&r1=1343063&r2=1343064&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/test-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/test-containers.xml Sun May 27 15:47:32
2012
@@ -50,19 +50,6 @@ under the License.
<property name="ssl-client-auth" value="true"/>
</container>
- <!-- load Shark Workflow Engine -->
- <!-- NOTE: before uncommenting this please see the instructions in the
ofbiz/OPTIONAL_LIBRARIES file.
- <container name="shark-container"
class="org.ofbiz.shark.container.SharkContainer">
- <property name="engine-name" value="Shark"/>
- <property name="delegator-name" value="test"/>
- <property name="dispatcher-name" value="WFDispatcher"/>
- <property name="admin-user" value="system"/>
- <property name="admin-pass" value="ofbiz"/>
- <property name="iiop-host" value="127.0.0.1"/>
- <property name="iiop-port" value="2001"/>
- </container>
- -->
-
<!-- Load embedded Jackrabbit content repository. Since this container
depends
upon JNDI, it must be started after the naming-container container.-->
<container name="jcr-container" class="org.ofbiz.jcr.loader.JCRContainer">
Modified: ofbiz/trunk/framework/service/config/serviceengine.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/config/serviceengine.xml?rev=1343064&r1=1343063&r2=1343064&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/config/serviceengine.xml (original)
+++ ofbiz/trunk/framework/service/config/serviceengine.xml Sun May 27 15:47:32
2012
@@ -61,7 +61,6 @@ under the License.
<engine name="rmi" class="org.ofbiz.service.rmi.RmiServiceEngine"/>
<engine name="soap" class="org.ofbiz.service.engine.SOAPClientEngine"/>
<engine name="ofbiz-workflow"
class="org.ofbiz.workflow.WorkflowEngine"/>
- <engine name="workflow"
class="org.ofbiz.shark.service.SharkServiceEngine"/>
<!-- The engine xml-rpc-local is only used by a test service and for
this reason it is configured to run on port 8081 (see
test-containers.xml);
in order to use this in OFBiz change the port accordingly (for
demo the default
Modified:
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java?rev=1343064&r1=1343063&r2=1343064&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java
(original)
+++
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java
Sun May 27 15:47:32 2012
@@ -79,7 +79,6 @@ public class LabelManagerFactory {
for (ComponentConfig componentConfig : componentConfigs) {
componentNamesFound.add(componentConfig.getComponentName());
}
- componentNamesFound.add("shark");
}
protected static void loadLabelFiles() throws IOException {
@@ -102,10 +101,6 @@ public class LabelManagerFactory {
}
}
}
- List<File> resourceFiles = FileUtil.findXmlFiles(System.getProperty("ofbiz.home") + "/specialpurpose/shark/config", null,
"resource", null);
- for (File resourceFile : resourceFiles) {
- filesFound.put(resourceFile.getName(), new LabelFile(resourceFile,
"shark"));
- }
}
public void findMatchingLabels(String component, String fileName, String key, String locale) throws MalformedURLException,
SAXException, ParserConfigurationException, IOException, EncodingException, GeneralException {
Modified:
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java?rev=1343064&r1=1343063&r2=1343064&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java
(original)
+++
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java
Sun May 27 15:47:32 2012
@@ -81,7 +81,6 @@ public class LabelReferences {
}
this.rootFolders.add(rootFolder);
}
- this.rootFolders.add(System.getProperty("ofbiz.home") +
"/specialpurpose/shark/");
}
public Map<String, Map<String, Integer>> getLabelReferences() throws IOException, SAXException, ParserConfigurationException,
GenericServiceException {
Modified: ofbiz/trunk/macros.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1343064&r1=1343063&r2=1343064&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Sun May 27 15:47:32 2012
@@ -120,7 +120,6 @@ under the License.
<exclude name="**/FopPdfViewHandler.java"/>
<exclude name="**/FreeMarkerViewRenderer.java"/>
<exclude name="**/JpCacheIncludeTransform.java"/>
- <exclude name="**/shark/"/>
</fileset>
<link href="http://java.sun.com/javase/6/docs/api/"; offline="true"
packagelistLoc="${ofbiz.home.dir}/tools/api-java16"/>
</javadoc>
