Skip to content

Conversation

@sheriff-rh
Copy link
Contributor

@sheriff-rh sheriff-rh commented Feb 7, 2019

fixes #13527

@jboxman would you please review?
@vikram-redhat I'll merge this PR from 3.7 onwards if it looks good to you.

@sheriff-rh sheriff-rh added this to the Next Release milestone Feb 7, 2019
@sheriff-rh sheriff-rh self-assigned this Feb 7, 2019
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Feb 7, 2019
@sheriff-rh
Copy link
Contributor Author

sheriff-rh commented Feb 7, 2019

Well, there's a lot of xrefs that need correcting. Thanks, Travis.

I'm a little unclear on the scope of the issue; do we want to remove all mentions (and xrefs) of xPaaS?

More descriptively, how far do we want to go with xPaaS removal? For example, in the getting_started/developers_cli.adoc file, we see a sizable section about what xPaaS can do in lines 94-116:

In addition, JBoss Middleware has put together a broad range of
https://github.com/jboss-openshift/application-templates[{product-title}
templates] as well as xref:../using_images/xpaas_images/index.adoc#using-images-xpaas-images-index[images] as
part of their xPaaS services.

The technologies available with the xPaaS services in particular include:

* Java EE 6 Application Server provided by JBoss EAP 6
* Integration and Messaging Services provided by JBoss Fuse and JBoss A-MQ
* Data Grid Service provided by JBoss Data Grid
* Real Time Decision Service provided by JBoss BRMS
* Java Web Server 3.0 provided by Tomcat 7 and Tomcat 8

With each of these offerings, a series of combinations are provided:

* HTTP only versus HTTP and HTTPS
* No database required, or the use of either MongoDB, PostgreSQL, or MySQL
* If desired, integration with A-MQ
endif::[]

To help illustrate constructing such applications, the following sections guide
you through creating a project that contains a sample Node.js application that
will serve a welcome page and the current hit count (stored in a database)

Does the whole section need to be deleted in this case?

@jboxman
Copy link
Contributor

jboxman commented Feb 7, 2019

When I looked, I found these:

/Users/jasonb/Self/work/openshift-docs/getting_started/beyond_the_basics.adoc
  442,23: templates] as well as xref:../using_images/xpaas_images/index.adoc#using-images-xpaas-images-index[images] as

/Users/jasonb/Self/work/openshift-docs/getting_started/developers_cli.adoc
  96,23: templates] as well as xref:../using_images/xpaas_images/index.adoc#using-images-xpaas-images-index[images] as

/Users/jasonb/Self/work/openshift-docs/welcome/index.adoc
  140,3: * xref:../using_images/xpaas_images/index.adoc#using-images-xpaas-images-index[Services provided by xPaaS Middleware Images]

@jboxman
Copy link
Contributor

jboxman commented Feb 7, 2019

My suspicion is that those references can be removed from the docs as well, but I'd also want confirmation if it was me. Based on the text, it seems reasonable that each entire line or block speaking about xPaaS images can be excised though.

@sheriff-rh
Copy link
Contributor Author

Thanks so much @jboxman . Just wanted to make sure I wasn't crazy!

@vikram-redhat
Copy link
Contributor

sigh This has gotten complex. :)

@sheriff-rh just take out the links to the xPaaS sections which are causing the build to fail. While the docs haven't been updated since 3.6 because the downstream was disbanded, the upstream GitHub repo containing these images seems to be still updated as late as Dec 2018.

cc: @aheslin

issue-13527 amended xPaaS changes
@openshift-docs-preview-bot

The preview will be availble shortly at:

@sheriff-rh
Copy link
Contributor Author

Squashed commits to remove xrefs. All checks have passed.

@openshift/team-documentation peer review please!
@vikram-redhat I think this was what you were looking for.

@ahardin-rh
Copy link
Contributor

LGTM

@ahardin-rh ahardin-rh added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Feb 11, 2019
@sheriff-rh sheriff-rh merged commit 1d53faf into openshift:master Feb 20, 2019
@sheriff-rh
Copy link
Contributor Author

/cherrypick enterprise-3.11

@openshift-cherrypick-robot

@sheriff-rh: #13567 failed to apply on top of branch "enterprise-3.11":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	_topic_map.yml
A	using_images/xpaas_images/a_mq.adoc
A	using_images/xpaas_images/data_grid.adoc
A	using_images/xpaas_images/decision_server.adoc
A	using_images/xpaas_images/eap.adoc
A	using_images/xpaas_images/eap_old.adoc
A	using_images/xpaas_images/fuse.adoc
A	using_images/xpaas_images/jws.adoc
A	using_images/xpaas_images/sso.adoc
M	welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.adoc
Removing using_images/xpaas_images/index.adoc
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _topic_map.yml
Patch failed at 0001 issue 13527 removed xPaaS image links

Details

In response to this:

/cherrypick enterprise-3.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-3.7 branch/enterprise-3.9 branch/enterprise-3.10 branch/enterprise-3.11 peer-review-done Signifies that the peer review team has reviewed this PR size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Link to outdated xpaas content

7 participants