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/08 18:47:55 UTC
svn commit: r1798107 - in /webservices/axiom/trunk:
aspects/dom-aspects/BUILD aspects/om-aspects/BUILD axiom-api/BUILD
buildutils/aspectj.bzl implementations/axiom-dom/BUILD
implementations/axiom-impl/BUILD
Author: veithen
Date: Thu Jun 8 18:47:55 2017
New Revision: 1798107
URL: http://svn.apache.org/viewvc?rev=1798107&view=rev
Log:
Enable building axiom-impl and axiom-dom using Bazel.
Added:
webservices/axiom/trunk/implementations/axiom-dom/BUILD
webservices/axiom/trunk/implementations/axiom-impl/BUILD
Modified:
webservices/axiom/trunk/aspects/dom-aspects/BUILD
webservices/axiom/trunk/aspects/om-aspects/BUILD
webservices/axiom/trunk/axiom-api/BUILD
webservices/axiom/trunk/buildutils/aspectj.bzl
Modified: webservices/axiom/trunk/aspects/dom-aspects/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/BUILD?rev=1798107&r1=1798106&r2=1798107&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/BUILD (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/BUILD Thu Jun 8 18:47:55 2017
@@ -1,3 +1,5 @@
+package(default_visibility = ["//visibility:public"])
+
load('//buildutils:aspectj.bzl', 'aspectj_library')
aspectj_library(
Modified: webservices/axiom/trunk/aspects/om-aspects/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/BUILD?rev=1798107&r1=1798106&r2=1798107&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/BUILD (original)
+++ webservices/axiom/trunk/aspects/om-aspects/BUILD Thu Jun 8 18:47:55 2017
@@ -1,3 +1,5 @@
+package(default_visibility = ["//visibility:public"])
+
load('//buildutils:aspectj.bzl', 'aspectj_library')
aspectj_library(
Modified: webservices/axiom/trunk/axiom-api/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/BUILD?rev=1798107&r1=1798106&r2=1798107&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/BUILD (original)
+++ webservices/axiom/trunk/axiom-api/BUILD Thu Jun 8 18:47:55 2017
@@ -146,3 +146,11 @@ java_library(
# TODO
javacopts = ['-extra_checks:off'],
)
+
+java_library(
+ name = "locator-loader",
+ srcs = glob(["src/main/java/org/apache/axiom/locator/loader/*.java"]),
+ deps = [
+ ":axiom-api",
+ ],
+)
Modified: webservices/axiom/trunk/buildutils/aspectj.bzl
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/aspectj.bzl?rev=1798107&r1=1798106&r2=1798107&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/aspectj.bzl (original)
+++ webservices/axiom/trunk/buildutils/aspectj.bzl Thu Jun 8 18:47:55 2017
@@ -1,11 +1,12 @@
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._runtime]])
+ deps_provider = java_common.merge([dep[java_common.provider] for dep in ctx.attr.deps + ctx.attr.aspects + [ctx.attr._runtime]])
ctx.action(
- inputs=list(deps_provider.transitive_runtime_jars) + ctx.files.srcs,
+ inputs=list(deps_provider.transitive_runtime_jars) + ctx.files.aspects + ctx.files.srcs,
outputs=[class_jar],
arguments=[
"-classpath", ctx.configuration.host_path_separator.join([f.path for f in deps_provider.transitive_runtime_jars]),
+ "-aspectpath", ctx.configuration.host_path_separator.join([f.path for f in ctx.files.aspects]),
"-outjar", class_jar.path,
"-source", "1.7",
"-target", "1.7",
@@ -24,6 +25,9 @@ aspectj_library = rule(
"deps": attr.label_list(
allow_files=False,
),
+ "aspects": attr.label_list(
+ allow_files=False,
+ ),
"_ajc": attr.label(
default=Label("//buildutils:ajc"),
allow_files=True,
Added: webservices/axiom/trunk/implementations/axiom-dom/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/BUILD?rev=1798107&view=auto
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/BUILD (added)
+++ webservices/axiom/trunk/implementations/axiom-dom/BUILD Thu Jun 8 18:47:55 2017
@@ -0,0 +1,18 @@
+load('//buildutils:aspectj.bzl', 'aspectj_library')
+
+aspectj_library(
+ name = "axiom-dom",
+ srcs = glob([
+ "src/main/java/**/*.java",
+ "src/main/java/**/*.aj",
+ ]),
+ aspects = [
+ "//aspects/core-aspects",
+ "//aspects/dom-aspects",
+ "//aspects/om-aspects",
+ "//aspects/shared-aspects",
+ ],
+ deps = [
+ "//axiom-api:locator-loader",
+ ],
+)
Added: webservices/axiom/trunk/implementations/axiom-impl/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/BUILD?rev=1798107&view=auto
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/BUILD (added)
+++ webservices/axiom/trunk/implementations/axiom-impl/BUILD Thu Jun 8 18:47:55 2017
@@ -0,0 +1,17 @@
+load('//buildutils:aspectj.bzl', 'aspectj_library')
+
+aspectj_library(
+ name = "axiom-impl",
+ srcs = glob([
+ "src/main/java/**/*.java",
+ "src/main/java/**/*.aj",
+ ]),
+ aspects = [
+ "//aspects/core-aspects",
+ "//aspects/om-aspects",
+ "//aspects/shared-aspects",
+ ],
+ deps = [
+ "//axiom-api:locator-loader",
+ ],
+)