Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DELTASPIKE-1189 Migrate index.html into git #62

Closed
wants to merge 1 commit into from

Conversation

oscerd
Copy link
Contributor

@oscerd oscerd commented Jul 24, 2016

Hi all,

The PR is related to:
https://issues.apache.org/jira/browse/DELTASPIKE-1189

Thanks! :-)

@johnament
Copy link
Contributor

Hi Andrea,

Thanks for the contrib. Couple of things I noticed.

  • This output is observed when building locally:
asciidoctor: WARNING: index.adoc: line 4: section title out of sequence: expected level 1, got level 2
asciidoctor: WARNING: index.adoc: line 19: section title out of sequence: expected level 1, got level 2
asciidoctor: WARNING: index.adoc: line 30: section title out of sequence: expected level 1, got level 2
asciidoctor: WARNING: index.adoc: line 38: section title out of sequence: expected level 1, got level 2
asciidoctor: WARNING: index.adoc: line 48: section title out of sequence: expected level 1, got level 2
  • The graphics don't render when I build locally. When I change to the proper URI (remove images/), the logo is way too large.
  • The layout is now much different. Do you know if there's a way to maintain our existing layout?

@oscerd
Copy link
Contributor Author

oscerd commented Jul 25, 2016

Hi John,

To convert the index.html I run the following commands with pandoc (first converting to markdown and then in asciidoc):

pandoc -s -r html <index.html_url> -o index.text
pandoc -s -S index.text -t asciidoc -o index.adoc

I noticed there is a file deltaspike-markdown.html included in the index.html

http://svn.apache.org/repos/asf/deltaspike/site/trunk/templates/deltaspike-markdown.html

We can follow the same procedure for it and then try to include it in the index.adoc with

include::deltaspike-markdown.adoc[]

But the result is ugly.

I'll try to avoid the Warning, for the layout I don't know how we can do.

@oscerd
Copy link
Contributor Author

oscerd commented Jul 25, 2016

The warnings disappeared

@johnament
Copy link
Contributor

Sorry, just getting back to this. We're using maven and asciidoctorj for the rendering right now. Never heard of pandoc.

@oscerd
Copy link
Contributor Author

oscerd commented Jul 30, 2016

Pandoc is a just a tool to convert from a format to another. Anyway now I don't see errors during the rendering, so I believe it can be merged and maybe think about the style next. Let me know :-)

@johnament
Copy link
Contributor

If this weren't our homepage, I would be OK with that. However, the homepage is what people see first, so it being clean is IMHO pretty important.

@johnament
Copy link
Contributor

What about rendering as a table? http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/#tables

@oscerd
Copy link
Contributor Author

oscerd commented Jul 30, 2016

Sure. I'll try to use tables :-)

Il 30/lug/2016 14:13, "John Ament" notifications@github.com ha scritto:

What about rendering as a table?
http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/#tables


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#62 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AE3r187Jd1Exi36b-cHX_kdNeYlaLKDwks5qaz_ugaJpZM4JTnsn
.

@oscerd
Copy link
Contributor Author

oscerd commented Jul 31, 2016

This is the best I was able to obtain.

@johnament
Copy link
Contributor

Ok, good. I think I can clean it up from here. Thanks!

@johnament
Copy link
Contributor

Would you mind fixing your second commit, or squashing?

@oscerd
Copy link
Contributor Author

oscerd commented Jul 31, 2016

Sure thing. I'll do it tomorrow if it's OK.

Il 31/lug/2016 15:09, "John Ament" notifications@github.com ha scritto:

Would you mind fixing your second commit, or squashing?


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#62 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AE3r1zAodHzT_DKqU_Jlwme42FqSI73Cks5qbJ6mgaJpZM4JTnsn
.

@johnament
Copy link
Contributor

No problem. One more thing, please make sure the ASF headers are on the file. You can see others in this directory

:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR  CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

@oscerd
Copy link
Contributor Author

oscerd commented Aug 1, 2016

Done. Squashed in a single commit.

@oscerd
Copy link
Contributor Author

oscerd commented Aug 8, 2016

The PR is ready with the required fix.

@johnament
Copy link
Contributor

Apologies, I'll be bringing this in this week.

@johnament
Copy link
Contributor

The changes have been pushed, but I had to rebase. Please close this PR.

@asfgit asfgit closed this in ebb24ac Oct 28, 2016
OndroMih pushed a commit to OndroMih/deltaspike that referenced this pull request Dec 18, 2016
- don't wrap MBeanException directly thrown by the MBean method
- document exception handling in @JmxManaged

This closes apache#66
This closes apache#62
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants