You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2017/06/10 17:30:49 UTC
svn commit: r1798333 - in /webservices/axiom/trunk:
aspects/core-aspects/BUILD aspects/dom-aspects/BUILD
aspects/om-aspects/BUILD aspects/shared-aspects/BUILD
buildutils/aspectj.bzl implementations/axiom-dom/BUILD
Author: veithen
Date: Sat Jun 10 17:30:49 2017
New Revision: 1798333
URL: http://svn.apache.org/viewvc?rev=1798333&view=rev
Log:
Compile Java classes separately from mixins.
Modified:
webservices/axiom/trunk/aspects/core-aspects/BUILD
webservices/axiom/trunk/aspects/dom-aspects/BUILD
webservices/axiom/trunk/aspects/om-aspects/BUILD
webservices/axiom/trunk/aspects/shared-aspects/BUILD
webservices/axiom/trunk/buildutils/aspectj.bzl
webservices/axiom/trunk/implementations/axiom-dom/BUILD
Modified: webservices/axiom/trunk/aspects/core-aspects/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/BUILD?rev=1798333&r1=1798332&r2=1798333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/BUILD (original)
+++ webservices/axiom/trunk/aspects/core-aspects/BUILD Sat Jun 10 17:30:49 2017
@@ -17,16 +17,25 @@
# under the License.
#
+package(default_visibility = ["//visibility:public"])
+
load('//buildutils:aspectj.bzl', 'aj_library')
+java_library(
+ name = "interface",
+ srcs = glob(["src/main/java/**/*.java"]),
+ neverlink = 1,
+ deps = [
+ "//components/core-streams",
+ ],
+)
+
aj_library(
name = "core-aspects",
- srcs = glob([
- "src/main/java/**/*.java",
- "src/main/java/**/*.aj",
- ]),
+ srcs = glob(["src/main/java/**/*.aj"]),
+ injars = [":interface"],
deps = [
+ # TODO: necessary because ajc doesn't understand header JARs
"//components/core-streams",
],
- visibility = ["//visibility:public"],
)
Modified: webservices/axiom/trunk/aspects/dom-aspects/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/BUILD?rev=1798333&r1=1798332&r2=1798333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/BUILD (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/BUILD Sat Jun 10 17:30:49 2017
@@ -34,8 +34,10 @@ aj_library(
"src/main/java/**/*.aj",
]),
deps = [
+ # TODO: too many dependencies here because ajc doesn't understand header JARs
":classes",
- "//aspects/core-aspects",
+ "//aspects/core-aspects:interface",
"//aspects/shared-aspects",
+ "//components/xml-utils",
],
)
Modified: webservices/axiom/trunk/aspects/om-aspects/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/BUILD?rev=1798333&r1=1798332&r2=1798333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/BUILD (original)
+++ webservices/axiom/trunk/aspects/om-aspects/BUILD Sat Jun 10 17:30:49 2017
@@ -28,11 +28,27 @@ aj_library(
"src/main/java/**/*.aj",
]),
deps = [
- "//aspects/core-aspects",
+ # TODO: too many dependencies because ajc doesn't understand header JARs
+ "@commons_logging//jar",
+ "//aspects/core-aspects:interface",
"//aspects/shared-aspects",
"//axiom-api",
+ "//axiom-api:blob",
+ "//axiom-api:ext-activation",
+ "//axiom-api:ext-io",
+ "//axiom-api:ext-stax",
+ "//axiom-api:mime",
+ "//axiom-api:stax",
+ "//axiom-api:util",
+ "//axiom-api:util-activation",
+ "//axiom-api:util-io",
"//axiom-api:util-base64",
+ "//axiom-api:util-namespace",
"//axiom-api:util-sax",
+ "//axiom-api:util-stax",
+ "//axiom-api:util-stax-wrapper",
"//components/base64-utils",
+ "//components/core-streams",
+ "//components/xml-utils",
],
)
Modified: webservices/axiom/trunk/aspects/shared-aspects/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/shared-aspects/BUILD?rev=1798333&r1=1798332&r2=1798333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/shared-aspects/BUILD (original)
+++ webservices/axiom/trunk/aspects/shared-aspects/BUILD Sat Jun 10 17:30:49 2017
@@ -26,7 +26,7 @@ aj_library(
"src/main/java/**/*.aj",
]),
deps = [
- "//aspects/core-aspects",
+ "//aspects/core-aspects:interface",
],
visibility = ["//visibility:public"],
)
Modified: webservices/axiom/trunk/buildutils/aspectj.bzl
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/aspectj.bzl?rev=1798333&r1=1798332&r2=1798333&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/aspectj.bzl (original)
+++ webservices/axiom/trunk/buildutils/aspectj.bzl Sat Jun 10 17:30:49 2017
@@ -19,13 +19,14 @@
def _impl(ctx):
class_jar = ctx.outputs.class_jar
- deps_provider = java_common.merge([dep[java_common.provider] for dep in ctx.attr.deps + ctx.attr.aspects + [ctx.attr._runtime]])
+ deps_provider = java_common.merge([dep[java_common.provider] for dep in ctx.attr.deps + ctx.attr.injars + ctx.attr.aspects])
ctx.action(
- inputs=list(deps_provider.transitive_runtime_jars) + ctx.files.aspects + ctx.files.srcs,
+ inputs=list(deps_provider.compile_jars) + ctx.files._runtime + ctx.files.aspects + ctx.files.injars + ctx.files.srcs,
outputs=[class_jar],
arguments=[
- "-classpath", ctx.configuration.host_path_separator.join([f.path for f in deps_provider.transitive_runtime_jars]),
+ "-classpath", ctx.configuration.host_path_separator.join([f.path for f in deps_provider.compile_jars + ctx.files._runtime]),
"-aspectpath", ctx.configuration.host_path_separator.join([f.path for f in ctx.files.aspects]),
+ "-injars", ctx.configuration.host_path_separator.join([f.path for f in ctx.files.injars]),
"-outjar", class_jar.path,
"-source", "1.7",
"-target", "1.7",
@@ -33,7 +34,8 @@ def _impl(ctx):
progress_message="Building %s" % class_jar.short_path,
executable=ctx.executable._ajc)
return [java_common.merge(
- [deps_provider, java_common.create_provider(compile_time_jars=[class_jar], runtime_jars=[class_jar])])]
+ [deps_provider, ctx.attr._runtime[java_common.provider],
+ java_common.create_provider(compile_time_jars=depset([class_jar]), runtime_jars=depset([class_jar]))])]
aj_library = rule(
implementation = _impl,
@@ -41,6 +43,9 @@ aj_library = rule(
"srcs": attr.label_list(
allow_files=FileType([".java", ".aj"]),
),
+ "injars": attr.label_list(
+ allow_files=False,
+ ),
"deps": attr.label_list(
allow_files=False,
),
Modified: webservices/axiom/trunk/implementations/axiom-dom/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/BUILD?rev=1798333&r1=1798332&r2=1798333&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/BUILD (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/BUILD Sat Jun 10 17:30:49 2017
@@ -35,7 +35,8 @@ java_library(
aj_library(
name = "axiom-dom",
srcs = glob([
- "src/main/java/**/*.java",
+ "src/main/java/org/apache/axiom/om/impl/dom/*.java",
+ "src/main/java/org/apache/axiom/soap/impl/dom/**/*.java",
"src/main/java/**/*.aj",
]),
aspects = [